resolve conflict 3 by bbq923

bbq923 · bbq923 · commit 86dcb59e039e · 2016-10-19T11:59:46.000+09:00
diff --git a/index.html b/index.html
@@ -14,6 +14,6 @@
 </head>
 <body>
   <script type="text/javascript" src="sample.js"></script>
-  <div id="test888"></div>
+  <div id="test999">Hello World!</div>
 </body>
 </html>
