Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -rd0a8679bc756e47321aff67f3ed1eb737b8535ff -r33f9914fba416faeaa89be285fa2cd182c4d29ed
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision d0a8679bc756e47321aff67f3ed1eb737b8535ff)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 33f9914fba416faeaa89be285fa2cd182c4d29ed)
@@ -126,27 +126,15 @@
  */
 function openLearnerShortenedUrl( lessonId ) {
 	if (isMac) {
-<<<<<<< HEAD
 		learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width 
-=======
-		learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width=' + learner_width 
->>>>>>> refs/remotes/asia/LDEV-4440
 				   + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 				   + getCenterParams(learner_width, learner_height));
 	} else {
 		if (learnWin && !learnWin.closed ) {
-<<<<<<< HEAD
 			learnWin.location = '../home/learner.do?lessonID='+lessonId;		
-=======
-			learnWin.location = '../home/learner.do&lessonID='+lessonId;		
->>>>>>> refs/remotes/asia/LDEV-4440
 			learnWin.focus();
 		} else {
-<<<<<<< HEAD
 			learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width='
-=======
-			learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width='
->>>>>>> refs/remotes/asia/LDEV-4440
 					   + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 					   + getCenterParams(learner_width, learner_height));
 		}