# HG changeset patch
# User Ryu <c116182@h.koeki-u.ac.jp>
# Date 1531460666 -32400
# Node ID 34db46580686529cd7a0901262180af00a794c65
# Parent  77d0ba7b65debd822c2a3006c000cc252d897229# Parent  bbdb0ea97d3071e56321f996cab89558f51c77dc
git merge

diff -r 77d0ba7b65de -r 34db46580686 oasis/oasis.html
--- a/oasis/oasis.html	Fri Jul 13 14:43:02 2018 +0900
+++ b/oasis/oasis.html	Fri Jul 13 14:44:26 2018 +0900
@@ -17,7 +17,7 @@
   <li><a href=""></a></li>
   <li><a href="https://skip.koeki-prj.org/">Top page</a></li>
   <li><a href="/shuzai/">取材</a></li>
-  <li><a href="/oasis/oasis.html">オアシスまつり</a></li>
+  <li><a href="">伝統芸能</a></li>
   <li><a href=""></a></li>
  </ul>
 </div>