remove merge marker

massif-press · Nov 20, 2020 · d6a79b4 · d6a79b4
1 parent 58d6e06
commit d6a79b4
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/src/features/encounters/npc/index.vue b/src/features/encounters/npc/index.vue
@@ -189,15 +189,7 @@
 </template>
 
 <script lang="ts">
-<<<<<<< HEAD
-<<<<<<< HEAD
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
-=======
-  import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
->>>>>>> parent of 6a97f2d... Added GM Resource Exporting!
-=======
-  import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
->>>>>>> parent of 6a97f2d... Added GM Resource Exporting!
 import PanelView from '../components/PanelView.vue'
 import NpcCard from './NpcCard.vue'
 import RosterGroup from './components/RosterGroup.vue'
@@ -231,17 +223,7 @@ export default class NpcManager extends Vue {
 
   @Watch('selectedNpc')
   onSelectedNpcChanged() {
-<<<<<<< HEAD
-<<<<<<< HEAD
     // this.$refs.view.resetScroll()
-=======
-    this.$refs.view.resetScroll()
-
->>>>>>> parent of 6a97f2d... Added GM Resource Exporting!
-=======
-    this.$refs.view.resetScroll()
-
->>>>>>> parent of 6a97f2d... Added GM Resource Exporting!
   }
 
   created() {