[concordance-commit] concordance/concordance concordance.c, 1.46, 1.47

[Phil D. <ja...@us...>]

Update of /cvsroot/concordance/concordance/concordance
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4082/concordance

Modified Files:
	concordance.c 
Log Message:
more merge conflict fixes


Index: concordance.c
===================================================================
RCS file: /cvsroot/concordance/concordance/concordance/concordance.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- concordance.c	10 Apr 2013 04:35:38 -0000	1.46
+++ concordance.c	11 Apr 2013 04:18:43 -0000	1.47
@@ -1,11 +1,7 @@
 /*
  * vi: formatoptions+=tc textwidth=80 tabstop=8 shiftwidth=8 noexpandtab:
  *
-<<<<<<< concordance.c
- * $Id$
-=======
  * $Id$
->>>>>>> 1.41.2.24
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by