chenjunkai 7 years ago
parent
commit
d5a35a2900
1 changed files with 0 additions and 1 deletions
  1. 0 1
      .gitattributes

+ 0 - 1
.gitattributes

@@ -1 +0,0 @@
-/Ansjer/settings.py merge=ours