
angular.module('mainCtrl.runningApp',[])
    .controller('mainCtrl',['$scope', '$mdDialog',function($scope, $mdDialog){
        $scope.message  = "I'm awesome!!!";
<<<<<<< HEAD
        $scope.map = { center: { latitude: 51, longitude: 7 }, zoom: 10 };
        
        $scope.showSearch = function(ev) {
        $mdDialog.show({
            controller: dialogCtrl,
            templateUrl: 'views/pFindEvent.html',
            parent: angular.element(document.body),
            targetEvent: ev,
            clickOutsideToClose:true
        })
        .then(function(searchText) {
            $scope.status = 'You said the information was "' + searchText + '".';
        }, function() {
            $scope.status = 'You cancelled the dialog.';
        }
            console.log(searchText);     
        );
      };
    }]);

function dialogCtrl($scope, $mdDialog) {
  $scope.hide = function() {
    $mdDialog.hide();
  };
  $scope.cancel = function() {
    $mdDialog.cancel();
  };
  $scope.answer = function(answer) {
    $mdDialog.hide(answer);
  };
};
=======
        
    }]);

>>>>>>> 034c1277c57e106ee44c399b092479c1e51754c1

@@ -162,21 +162,8 @@
 !%22;%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
     
@@ -233,24 +233,16 @@
 : 10 %7D;%0A
-        
 %0A       
@@ -763,21 +763,16 @@
 chText);
-     
 %0A       
@@ -1028,80 +1028,4 @@
 %0A%7D;%0A
-=======%0A        %0A    %7D%5D);%0A%0A%3E%3E%3E%3E%3E%3E%3E 034c1277c57e106ee44c399b092479c1e51754c1%0A

Fix merge conflict