diff --git a/foodpantry.html b/foodpantry.html
index 0d74ffd..70e3101 100644
--- a/foodpantry.html
+++ b/foodpantry.html
@@ -25,12 +25,16 @@
 <p>フードパントリーについては<a href="url">こちら</a></p>
 
 <h2>
-202../../../
+2021/12/5/
 </h2>
 <p>まえたみです</p>
 <p>aa</p>
 <p>aa</p>
+<p>ss</p>
+>>>>>>> 76448e25bc5ae9a1299fb0ecbbb100e17a263416
+<p>aa</p>
 <div class = "gazo">
 <img src="gazo/ファイル名"widh=""500 height="500">
    </div>
-     <p>
+     <p></p>
+</html>