Merge pull request #2 from mkmkryu/conflict2

Edit test.html
mkmkryu · Apr 14, 2019 · d59d906 · d59d906
2 parents c20ae18 + 69319a1
commit d59d906
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/site/test.html b/site/test.html
@@ -9,5 +9,6 @@
   </head>
   <body>
     こんにちは、世界
+    こんばんは、世界
   </body>
 </html>