Fix merge conflicts

lms/templates/notes.html

@@ -64,21 +64,12 @@
         <section id="catchDIV">
             <div class="annotationListContainer">${_('You do not have any notes.')}</div>
         </section>
-<<<<<<< HEAD
         <script>
 
         //Grab uri of the course
         var parts = window.location.href.split("/"),
             uri = '';
         for (var index = 0; index <= 6; index += 1) uri += parts[index]+"/"; //Get the unit url
-=======
-    	<script>
-
-    	//Grab uri of the course
-    	var parts = window.location.href.split("/"), 
-    		uri = '';
-	for (var index = 0; index <= 6; index += 1) uri += parts[index]+"/"; //Get the unit url
->>>>>>> edx/master
         var pagination = 100,
             is_staff = false,
             options = {
@@ -177,11 +168,7 @@
                   },
             },
             auth: {
-<<<<<<< HEAD
-                tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course.id.to_deprecated_string()}"
-=======
                 token: "${token}"
->>>>>>> edx/master
             },
             store: {
                 // The endpoint of the store on your server.