diff --git a/source/_posts/理解Python中列表，元组，字典，集合的区别.md b/source/_posts/理解Python中列表，元组，字典，集合的区别.md
index cfcfdb6f..4fe23e90 100644
--- a/source/_posts/理解Python中列表，元组，字典，集合的区别.md
+++ b/source/_posts/理解Python中列表，元组，字典，集合的区别.md
@@ -1,12 +1,7 @@
 ---
 title: 理解Python中列表，元组，字典，集合的区别
-<<<<<<< HEAD
-date: 2021-02-28 18:34:56
+date: 2020-12-28 18:34:56
 updated: 2021-02-28 20:20:44
-=======
-date: 2020-05-06 19:23:18
-updated: 2020-9-24 10:27:58
->>>>>>> refs/remotes/origin/main
 tags:
 categories:
 keywords: