[docs] docs - kwalsh modified ictags.sdf

docs at icdevgroup.org docs at icdevgroup.org
Mon Jul 26 20:13:20 EDT 2004


User:      kwalsh
Date:      2004-07-27 00:13:20 GMT
Modified:  .        ictags.sdf
Log:
	* Corrected a CVS conflict that seems to have crept in.

Revision  Changes    Path
1.121     +2 -6      docs/ictags.sdf


rev 1.121, prev_rev 1.120
Index: ictags.sdf
===================================================================
RCS file: /var/cvs/docs/ictags.sdf,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ictags.sdf	26 Jul 2004 21:50:13 -0000	1.120
+++ ictags.sdf	27 Jul 2004 00:13:20 -0000	1.121
@@ -1,10 +1,10 @@
 !init OPT_LOOK="icdevgroup"; OPT_STYLE="manual" 
-# $Id: ictags.sdf,v 1.120 2004/07/26 21:50:13 racke Exp $
+# $Id: ictags.sdf,v 1.121 2004/07/27 00:13:20 kwalsh Exp $
 
 !define DOC_NAME "Interchange Tags Reference"
 !define DOC_TYPE ""
 !define DOC_CODE "ictags"
-!define DOC_VERSION substr('$Revision: 1.120 $', 11, -2)
+!define DOC_VERSION substr('$Revision: 1.121 $', 11, -2)
 !define DOC_STATUS "Draft"
 !define DOC_PROJECT "Interchange"
 !define DOC_URL "http://www.icdevgroup.org/doc/ictags.html"
@@ -12688,11 +12688,7 @@
 user value C<state>, and/or the C<shipmodes> column of the country based
 on the value C<country>
 
-<<<<<<< ictags.sdf
-.NOTE: You can set the following, though most will use the Interchange
-=======
 \NOTE: You can set the following, though most will use the Interchange
->>>>>>> 1.116
 defaults:
 
 !block example








More information about the docs mailing list