[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[sakharuk]

sakharuk		Fri Aug 13 14:06:14 2004 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Sorry, O haven't removed all this crap (but I saw it).
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.323 loncom/interface/lonprintout.pm:1.324
--- loncom/interface/lonprintout.pm:1.323	Fri Aug 13 13:40:55 2004
+++ loncom/interface/lonprintout.pm	Fri Aug 13 14:06:14 2004
@@ -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 @@
 		$topmargin = '3.5 in';
 	    }
 	}
-<<<<<<< lonprintout.pm
     } elsif($papersize eq '1') {
 	if ($layout eq 'book') {
 	    if ($numberofcolumns == 1) {