[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS layout.conf,1.32,1.33

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv18300/apps/windoze/CBuilder5/BibleCS

Modified Files:
	layout.conf 
Log Message:


Index: layout.conf
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/layout.conf,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- layout.conf	4 Dec 2001 23:29:23 -0000	1.32
+++ layout.conf	15 Jul 2003 21:41:56 -0000	1.33
@@ -17,11 +17,6 @@
 Wesley=
 
 [History]
-<<<<<<< layout.conf=
-<<<<<<< layout.conf=
-<<<<<<< layout.conf=
->>>>>>> 1.26=
->>>>>>> 1.26=
 LastComModule=MHC
 LastTextModule=NKJV
 LastVerse=John 3:1
@@ -54,7 +49,6 @@
 WebstersDict=
 
 [TextView]
->>>>>>> 1.26=
 AKJV=true
 ALB=false
 ASV=true