解决冲突

1 year ago · 0a92e3d899
4 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
				@@ -1 +0,0 @@
-.DS_Store
--- a/tajian/css/.DS_Store
+++ b/tajian/css/.DS_Store
--- a/tajian/images/.DS_Store
+++ b/tajian/images/.DS_Store
--- a/tajian/js/.DS_Store
+++ b/tajian/js/.DS_Store