fix: an unsolved conflict

Author: psy

journals/2020_05_31.org

@@ -1,15 +1,10 @@
 * Sunday, 05/31/2020
-<<<<<<< ours
-**  Changelog
-*** Custom journal date format support. [[特色功能]]
-=======
 ** Changelog
-*** Custom journal date format support. [[Features]]
+*** Custom journal date format support. [[特色功能]]
 :PROPERTIES:
 :id: 60acdeb9-aa65-492b-8398-d4d65c1631c1
 :END:
 
->>>>>>> theirs
     You can set the ~:date-formatter~ in ~logseq.edn~.
     The default formatter is ~"MMM do, yyyy"~, which will be something like
     ~Jun 1st, 2020~.
@@ -36,4 +31,4 @@
 ** Fixed issues
 *** Org mode auto link parsing.
 *** Markdown definition parsing (it supports both multiple definitions and multiple lines now).
-*** Footnote parsing.
+*** Footnote parsing.