Resolve "Frontend for Models"

Closes #1 (closed)

aleksis/apps/lesrooster/frontend/components/lesson_raster/LessonRaster.vue

@@ -55,10 +55,7 @@
 
     <v-hover
       v-for="weekday in weekdays"
-<<<<<<< HEAD
       :key="weekday"
-=======
->>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
       :style="{
         gridColumn: weekday,
       }"
@@ -153,10 +150,7 @@
       <v-menu offset-y>
         <template #activator="{ on, attrs }">
           <slot-card
-<<<<<<< HEAD
             :key="slot.id"
-=======
->>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
             :item="slot"
             :disabled="$apollo.queries.items.loading"
             @click:delete="deleteSingularSlot"
@@ -222,10 +216,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-=======
-import { createBreakSlot, deleteBreakSlots } from "../break.graphql";
->>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
 import {
   carryOverSlots,
   slots,
@@ -246,10 +236,6 @@ export default {
     DeleteDialog,
     DeleteMultipleDialog,
     SlotCard,
-<<<<<<< HEAD
-=======
-    SecondaryActionButton,
->>>>>>> 2-add-model-for-planning-of-courses-dependend-on-validityrange
     ValidityRangeField,
   },
   apollo: {