Merge remote-tracking branch 'origin/master'

# Conflicts: # .gitattribute
zhuyoucai168 · Feb 15, 2019 · 4c600b3 · 4c600b3
2 parents 1704c02 + 2a8c074
commit 4c600b3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.gitattribute b/.gitattribute
@@ -1 +1,5 @@
-*.py linguist-language=python
+<<<<<<< HEAD
+*.py linguist-language=python
+=======
+*.py linguist-language=python
+>>>>>>> origin/master