fix: [DHIS2-14352] remove merge conflict artifact (#1646)

dhis2 · Dec 22, 2022 · 5602931 · 5602931
1 parent ee046b7
commit 5602931
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/d2-tracker/dhis2.angular.services.js b/d2-tracker/dhis2.angular.services.js
@@ -2633,7 +2633,7 @@ var d2Services = angular.module('d2Services', ['ngResource'])
                     output = 0;
                 }
                 return output;
-            },sssssssssssssssssssssssssssssssssssssssssssss
+            },
         },
         "d2:count": {
             parameters: 1,