From 5602931b70002086d357f516ee05948b16064e37 Mon Sep 17 00:00:00 2001 From: Tony Valle <79843014+superskip@users.noreply.github.com> Date: Thu, 22 Dec 2022 15:34:11 +0100 Subject: [PATCH] fix: [DHIS2-14352] remove merge conflict artifact (#1646) --- d2-tracker/dhis2.angular.services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2-tracker/dhis2.angular.services.js b/d2-tracker/dhis2.angular.services.js index 30ec0c19c..362ac9586 100644 --- 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,