merge the file
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1 +1,5 @@
|
||||
<<<<<<< HEAD
|
||||
secret.txt
|
||||
=======
|
||||
secret.txt
|
||||
>>>>>>> feature/bugSheet
|
||||
|
||||
Reference in New Issue
Block a user