resolved additional merge conflics

TAMULib · Apr 22, 2019 · b6edc81 · b6edc81
1 parent 39c6213
commit b6edc81
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -203,11 +203,8 @@
   <script src="repo/jobRepo.js"></script>
   <script src="repo/readerRepo.js"></script>
   <script src="repo/writerRepo.js"></script>
-<<<<<<< HEAD
   <script src="repo/discoveryViewRepo.js"></script>
-=======
   <script src="repo/userRepo.js"></script>
->>>>>>> master
 
   <!-- Models -->
   <script src="model/abstractAppModel.js"></script>
@@ -243,15 +240,11 @@
   <script src="controllers/management/jobManagementController.js"></script>
   <script src="controllers/management/readerManagementController.js"></script>
   <script src="controllers/management/writerManagementController.js"></script>
-<<<<<<< HEAD
   <script src="controllers/management/discoveryViewManagementController.js"></script>
   <script src="controllers/discoveryContextController.js"></script>
   <script src="controllers/singleResultController.js"></script>
-
-=======
   <script src="controllers/usersController.js"></script>
   <script src="controllers/appLoginController.js"></script>
->>>>>>> master
   <!-- endbuild -->
 
 </body>