feat: save conflict resolution

This commit is contained in:
NGPixel committed 2020-03-21 19:18:08 -04:00
1 parent bacbe4f543
commit 4b0e3d1c43
12 files changed
+400 -31

No files matched your search

+2 -1
View File
@@ -10,7 +10,8 @@ const state = {
folderTree: [],
currentFolderId: 0,
currentFileId: null
}
},
checkoutDateActive: ''
}
export default {