chore: merge conflict

dhis2 · Oct 2, 2023 · 6f5fb3d · 6f5fb3d
1 parent d7a1b31
commit 6f5fb3d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-09-27T14:55:16.411Z\n"
-"PO-Revision-Date: 2023-09-27T14:55:16.411Z\n"
+"POT-Creation-Date: 2023-10-02T10:40:33.275Z\n"
+"PO-Revision-Date: 2023-10-02T10:40:33.275Z\n"
 
 msgid "Untitled map, {{date}}"
 msgstr "Untitled map, {{date}}"
@@ -301,6 +301,9 @@ msgstr "Legend preview"
 msgid "Mean"
 msgstr "Mean"
 
+msgid "Sum"
+msgstr "Sum"
+
 msgid "Min"
 msgstr "Min"
 
@@ -874,9 +877,6 @@ msgstr "By data element"
 msgid "Average"
 msgstr "Average"
 
-msgid "Sum"
-msgstr "Sum"
-
 msgid "Standard deviation"
 msgstr "Standard deviation"
 

diff --git a/src/components/edit/earthEngine/PeriodReducer.js b/src/components/edit/earthEngine/PeriodReducer.js
@@ -10,7 +10,6 @@ import PeriodSelect from '../../periods/PeriodSelect.js'
 import StartEndDates from '../../periods/StartEndDates.js'
 import { START_END_DATES } from '../../../constants/periods.js'
 import { getTimeRange } from '../../../util/earthEngine.js'
-import layerEdit from '../../../reducers/layerEdit.js'
 
 // TOOD: Remove reducers that are less relevant
 const periodReducers = [

diff --git a/src/reducers/layerEdit.js b/src/reducers/layerEdit.js
@@ -324,10 +324,6 @@ const layerEdit = (state = null, action) => {
             newState = {
                 ...state,
                 colorScale: action.colorScale,
-<<<<<<< HEAD
-                // classes: action.colorScale.split(',').length,
-=======
->>>>>>> ee-dev
                 classes: action.colorScale.length,
             }