Fix some rebasing conflicts

2026-06-13 05:48:36 +03:00 · 2018-12-10 16:12:18 +01:00
parent f76000d4d9
commit dc1dece1d9
5 changed files with 12 additions and 25 deletions
--- a/src/store/initial.js
+++ b/src/store/initial.js
@@ -106,8 +106,8 @@ const initial = {
      categories: {
        default: 'red',
        // Add here other categories to differentiate by color, like:
-        alpha: '#c73e1d',
-        beta: '#f40000',
+        alpha: '#00ff00',
+        beta: '#ff0000',
        other: '#f3de2c'
      },