--- loncom/interface/lonprintout.pm	2004/08/13 17:40:55	1.323
+++ loncom/interface/lonprintout.pm	2004/08/13 18:06:14	1.324
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.323 2004/08/13 17:40:55 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.324 2004/08/13 18:06:14 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -415,7 +415,6 @@ sub page_format {
 		$topmargin = '3.5 in';
 	    }
 	}
-<<<<<<< lonprintout.pm
     } elsif($papersize eq '1') {
 	if ($layout eq 'book') {
 	    if ($numberofcolumns == 1) {