feat: save conflict resolution

2020-03-21 19:18:08 -04:00
parent bacbe4f543
commit 4b0e3d1c43
12 changed files with 400 additions and 31 deletions
--- a/client/store/editor.js
+++ b/client/store/editor.js
@@ -10,7 +10,8 @@ const state = {
    folderTree: [],
    currentFolderId: 0,
    currentFileId: null
-  }
+  },
+  checkoutDateActive: ''
 }

 export default {