Resolve "Make exam a many to many field on StudentInfo model"

Closes #233 (closed)

frontend/src/components/BaseLayout.vue

@@ -123,16 +123,9 @@ import { mapStateToComputedGetterSetter } from '@/util/helpers'
 import UserOptions from '@/components/UserOptions'
 import InstanceActions from '@/components/InstanceActions'
 import { Authentication } from '@/store/modules/authentication'
-<<<<<<< HEAD
-=======
 import { actions } from '@/store/actions'
 import { ConfigModule } from '../store/modules/config'
 
-<<<<<<< HEAD
->>>>>>> added ExamSelectionPage after Login, added currentExam to config store.
-=======
->>>>>>> added ExamSelectionPage after Login, added currentExam to config store.
-
 export default {
   name: 'BaseLayout',
   components: { InstanceActions, UserOptions },
@@ -195,13 +188,10 @@ export default {
     margin: 15px;
   }
 
-<<<<<<< HEAD
 </style>
 
 <style>
   .grady-toolbar > div {
     padding-right: 0;
   }
-=======
->>>>>>> added ExamSelectionPage after Login, added currentExam to config store.
 </style>