Commit 81aed4cc authored by Eric Eastwood's avatar Eric Eastwood

Remove duplicated conflict resolution code to fix eslint

parent 581fe77b
...@@ -164,20 +164,6 @@ ...@@ -164,20 +164,6 @@
}, },
}, },
}; };
methods: {
highlightChanges() {
this.highlightChangesClass = true;
this.$nextTick(() => {
this.highlightChangesClass = false;
});
},
visibilityAllowed(option) {
return this.allowedVisibilityOptions.includes(option);
},
},
};
</script> </script>
<template> <template>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment