diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-06-11 11:38:01 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-06-11 11:40:52 +0300 |
| commit | 5792c6c0993e4b22b2e39db9ec511502b5e654ff (patch) | |
| tree | 7c748572b57cfe9086ec3696b4746c090d2a6c21 /src/components/CollisionResolveDialog.vue | |
| parent | 71bb5fbd1f9232f8a6e08dbd925c9c875f402045 (diff) | |
Fix code style and add missing files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'src/components/CollisionResolveDialog.vue')
| -rw-r--r-- | src/components/CollisionResolveDialog.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/CollisionResolveDialog.vue b/src/components/CollisionResolveDialog.vue index a64d09a51..d3ee725ed 100644 --- a/src/components/CollisionResolveDialog.vue +++ b/src/components/CollisionResolveDialog.vue @@ -21,7 +21,7 @@ --> <template> - <div class="collision-resolve-dialog" id="resolve-conflicts"> + <div id="resolve-conflicts" class="collision-resolve-dialog"> <button @click="$emit('resolveUseThisVersion')"> Use your version </button> @@ -32,9 +32,9 @@ </template> <script> - export default { - name: 'CollisionResolveDialog' - } +export default { + name: 'CollisionResolveDialog' +} </script> <style scoped lang="scss"> |