fixing merges. ugh

Author: johnpapa

assets/sublime-angular-snippets/angular.controller.sublime-snippet

@@ -4,7 +4,6 @@
 
     angular
         .module('${1:module}')
-<<<<<<< HEAD
         .controller('${2:Controller}', ${2:Controller});
 
     /* @ngInject */
@@ -16,19 +15,16 @@
 
         ////////////////
 
-=======
-        .controller('${2:Ctrl}', ${2:Ctrl});
+        /* @ngInject */
+        function ${2:Ctrl}(${3:dependencies}) {
+            /*jshint validthis: true */
+            var vm = this;
+            vm.title = '${2:Ctrl}';
 
-    /* @ngInject */
-    function ${2:Ctrl}(${3:dependencies}) {
-        /*jshint validthis: true */
-        var vm = this;
-        vm.title = '${2:Ctrl}';
-
-        activate();
+            activate();
 
->>>>>>> 93eb74f33dd1304fdc4ab48fd47166055650a1ff
-        function activate() {
+            function activate() {
+            }
         }
     }
 })();

assets/sublime-angular-snippets/angular.directive.sublime-snippet

@@ -13,31 +13,24 @@
         // Creates:
         //
         var directive = {
-<<<<<<< HEAD
+            bindToController: true,
             controller: ${4:Controller},
             controllerAs: '${5:vm}',
             link: link,
             restrict: 'A',
             scope: {
             }
-=======
-            link: link,
-            restrict: 'A'
->>>>>>> 93eb74f33dd1304fdc4ab48fd47166055650a1ff
         };
         return directive;
 
         function link(scope, element, attrs) {
         }
     }
-<<<<<<< HEAD
 
     /* @ngInject */
     function ${4:Controller} () {
 
     }
-=======
->>>>>>> 93eb74f33dd1304fdc4ab48fd47166055650a1ff
 })();
 ]]></content>
     <tabTrigger>ngdirective</tabTrigger>