2.38.0 nhdacdc

README.md

@@ -16,3 +16,21 @@ yarn start
 ```
 
 This starts the development server on port `8081`.
+<<<<<<< HEAD
+=======
+
+### Deploying the changes
+To deploy the changes you'll need to follow the following steps.
+
+Change the npm package version for the app either for `major`, `minor`, or `patch`.
+```
+npm version patch
+```
+
+Run the build script to build the app
+```
+npm run build
+```
+> **Note:** If you have problems running the app try running the dhis2-core server with TomCat.
+
+>>>>>>> ac3102d94d65dc306329e5895813481f3da7d57b

components/dashboard/dashboard-controller.js

@@ -176,7 +176,6 @@ trackerCapture.controller('DashboardController',
                         $scope.optionSets[optionSet.id] = optionSet;
                     });
                     return AttributesFactory.getAll();
-
                 }).then(function(atts) {
                     $scope.attributesById = [];
                     angular.forEach(atts, function (att) {