Update
This commit is contained in:
6
.gitignore
vendored
6
.gitignore
vendored
@@ -3,8 +3,14 @@
|
||||
*.log
|
||||
tmp/
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 6231dc6 (Add gitignore)
|
||||
=======
|
||||
|
||||
=======
|
||||
>>>>>>> 8ac4896 (Update)
|
||||
>>>>>>> 70fd802 (Update)
|
||||
custom.el
|
||||
|
||||
Reference in New Issue
Block a user