* conflict.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2721 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/include/mod_chxj.h b/include/mod_chxj.h
index 2b43110..8220624 100644 (file)
--- a/include/mod_chxj.h
+++ b/include/mod_chxj.h
@@ -273,11 +273,8 @@ typedef enum {
   tagPLAINTEXT,
   tagBLINK,
   tagMARQUEE,
-<<<<<<< HEAD:include/mod_chxj.h
   tagLINK,
-=======
   tagNLMARK,      /* New Line Code */
->>>>>>> master:include/mod_chxj.h
 } tag_type;
 
 typedef struct mod_chxj_config mod_chxj_config;

diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c
index d396179..bb84031 100644 (file)
--- a/src/chxj_chtml10.c
+++ b/src/chxj_chtml10.c
@@ -106,12 +106,9 @@ static char *s_chtml10_end_menu_tag       (void *pdoc, Node *node);
 static char *s_chtml10_start_plaintext_tag(void *pdoc, Node *node);
 static char *s_chtml10_start_plaintext_tag_inner(void  *pdoc, Node *node);
 static char *s_chtml10_end_plaintext_tag  (void *pdoc, Node *node);
-<<<<<<< HEAD:src/chxj_chtml10.c
 static char *s_chtml10_link_tag           (void *pdoc, Node *node);
 static char *s_chtml10_style_tag          (void *pdoc, Node *node);
-=======
 static char *s_chtml10_newline_mark       (void *pdoc, Node *node);
->>>>>>> master:src/chxj_chtml10.c
 
 static void  s_init_chtml10(chtml10_t *chtml, Doc *doc, request_rec *r, device_table *spec);
 
@@ -385,17 +382,14 @@ tag_handler chtml10_handler[] = {
     NULL,
     NULL,
   },
-<<<<<<< HEAD:src/chxj_chtml10.c
   /* tagLINK */
-=======
-  /* tagNLMARK */
->>>>>>> master:src/chxj_chtml10.c
   {
-<<<<<<< HEAD:src/chxj_chtml10.c
     s_chtml10_link_tag,
-=======
+    NULL,
+  },
+  /* tagNLMARK */
+  {
     s_chtml10_newline_mark,
->>>>>>> master:src/chxj_chtml10.c
     NULL,
   },
 };