Mercurial > hgrepos > hgweb.cgi > skipweb

changeset 2896:8020ae013cca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zoo renewed
author ITO Shiho <c115022@g.koeki-u.ac.jp>
date Thu, 03 Dec 2015 09:34:10 +0900
parents e0e787ccaa35
children ff41f5abbb25
files shuzai/zoo/haku2.jpg shuzai/zoo/index.html
diffstat 1 files changed, 4 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/shuzai/zoo/index.html	Tue Dec 01 22:59:48 2015 +0900
+++ b/shuzai/zoo/index.html	Thu Dec 03 09:34:10 2015 +0900
@@ -5,22 +5,16 @@
 ¾±Æâ¶è°è¤ÎÀ¸¤­Êª¤Þ¤È¤á
  </title>
  <meta charset="euc-jp">
-<<<<<<< local
-=======
-<<<<<<< local
->>>>>>> other
+
  <link rel="stylesheet" href="../../skip.css" type="text/css">
-<<<<<<< local
-=======
-=======
+
  <link rel="stylesheet" href="../../skip.css"> 
 <style type="text/css">
 <!--
-h2{color:red;}
+
 -->
 </style>
->>>>>>> other
->>>>>>> other
+
 
 </head>
 <body>
@@ -64,18 +58,10 @@
 
 -->
 
-<<<<<<< local
-=======
-<<<<<<< local
-=======
 <h3>ÄᲬ¸ø±à¤ÎÇòÄ»
 </h3>
 <p><img src="haku2.jpg" width="150" height="100"></p>
 
->>>>>>> other
->>>>>>> other
-
-
 <a href="../syuzai.html">Ìá¤ë</a>
 <br>
 <a href="../../index.html">home</a>

yatex.org