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

+1 -1
View File
@@ -105,7 +105,7 @@
v-icon(left) mdi-code-tags
span Source
v-divider.mx-2(vertical)
v-btn(color='primary', text, :href='`/h/` + page.locale + `/` + page.path', disabled)
v-btn(color='primary', text, :href='`/h/` + page.locale + `/` + page.path')
v-icon(left) mdi-history
span History
v-spacer