back

GKPython · GKPython · commit 1c10e382da67 · 2020-06-16T19:24:10.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,11 @@ db.json
 *.log
 node_modules/
 public/
-.deploy*/
+<<<<<<< HEAD
+.deploy*/
+=======
+.deploy*/
+.bak
+_config.yml
+
+>>>>>>> fa372eb98a467f97dc6b239c1c4ab4544edd6647
diff --git a/source/_posts.rar b/source/_posts.rar
diff --git a/source/_posts/pagedayu.md b/source/_posts/pagedayu.md
@@ -1,8 +1,7 @@
----
+﻿---
 title: 影评-大鱼
 date: 2020-06-09 20:42:25
 tags: 感悟
 ---
 
-
-hello world！
+hello world！
diff --git a/source/_posts/pagedayu.md.bak b/source/_posts/pagedayu.md.bak
@@ -0,0 +1,16 @@
+<<<<<<< HEAD
+---
+=======
+﻿---
+>>>>>>> fa372eb98a467f97dc6b239c1c4ab4544edd6647
+title: 影评-大鱼
+date: 2020-06-09 20:42:25
+tags: 感悟
+---
+
+
+<<<<<<< HEAD
+hello world！
+=======
+hello world,my test!
+>>>>>>> fa372eb98a467f97dc6b239c1c4ab4544edd6647
