Fix merge conflict in Sublime snippet

Author: oscar-b

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

@@ -15,16 +15,7 @@
 
         ////////////////
 
-        /* @ngInject */
-        function ${2:Ctrl}(${3:dependencies}) {
-            /*jshint validthis: true */
-            var vm = this;
-            vm.title = '${2:Ctrl}';
-
-            activate();
-
-            function activate() {
-            }
+        function activate() {
         }
     }
 })();