Merge remote changes
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -159,3 +159,7 @@ cython_debug/
|
|||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> 638a19d39481855fcdac76f9c3ec23c860db016d
|
||||||
|
|||||||
Reference in New Issue
Block a user