[docs] docs - jon modified ictags.sdf

docs@interchange.redhat.com docs@interchange.redhat.com
Wed Jun 5 22:03:01 2002


User:      jon
Date:      2002-06-06 02:02:25 GMT
Modified:  .        ictags.sdf
Log:
Resolve a conflict from the last commit.

Revision  Changes    Path
1.84      +2 -5      docs/ictags.sdf


rev 1.84, prev_rev 1.83
Index: ictags.sdf
===================================================================
RCS file: /var/cvs/docs/ictags.sdf,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -u -r1.83 -r1.84
--- ictags.sdf	6 Jun 2002 02:01:51 -0000	1.83
+++ ictags.sdf	6 Jun 2002 02:02:25 -0000	1.84
@@ -1,10 +1,10 @@
 !init OPT_LOOK="akopia"; OPT_STYLE="manual" 
-# $Id: ictags.sdf,v 1.83 2002/06/06 02:01:51 jon Exp $
+# $Id: ictags.sdf,v 1.84 2002/06/06 02:02:25 jon Exp $
 
 !define DOC_NAME "Interchange Tags Reference"
 !define DOC_TYPE ""
 !define DOC_CODE "ictags"
-!define DOC_VERSION substr('$Revision: 1.83 $', 11, -2)
+!define DOC_VERSION substr('$Revision: 1.84 $', 11, -2)
 !define DOC_STATUS "Draft"
 !define DOC_PROJECT "Interchange"
 !define DOC_URL "http://interchange.redhat.com/doc/ictags.html"
@@ -13143,7 +13143,6 @@
 !endblock
 
 
-<<<<<<< ictags.sdf
 B<Tag expansion example:>
 
 !block example
@@ -13153,8 +13152,6 @@
 !endblock
 
 
-=======
->>>>>>> 1.82
 B<ASP-like Perl call:>
 
 !block example; lang="Perl"