Restored.

Author: pokono

Diff for: dist/angular-gettext.js

@@ -336,18 +336,12 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "gettextF
                 method: 'GET',
                 url: url,
                 cache: catalog.cache
-<<<<<<< HEAD
-            }).success(function (data) {
+            }).then(function (response) {
+                var data = response.data;
                 if (typeof data === 'object') {
                     for (var lang in data) {
                         catalog.setStrings(lang, data[lang]);
                     }
-=======
-            }).then(function (response) {
-                var data = response.data;
-                for (var lang in data) {
-                    catalog.setStrings(lang, data[lang]);
->>>>>>> rubenv/master
                 }
                 return response;
             });

Diff for: dist/angular-gettext.min.js

@@ -284,18 +284,12 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, ge
                 method: 'GET',
                 url: url,
                 cache: catalog.cache
-<<<<<<< HEAD
-            }).success(function (data) {
+            }).then(function (response) {
+                var data = response.data;
                 if (typeof data === 'object') {
                     for (var lang in data) {
                         catalog.setStrings(lang, data[lang]);
                     }
-=======
-            }).then(function (response) {
-                var data = response.data;
-                for (var lang in data) {
-                    catalog.setStrings(lang, data[lang]);
->>>>>>> rubenv/master
                 }
                 return response;
             });