mirror of
https://github.com/nushell/nushell.git
synced 2024-11-25 01:43:47 +01:00
gitignore conflict fix
This commit is contained in:
parent
5fabfda57b
commit
101f4f62a8
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
/target
|
||||
/scratch
|
||||
**/*.rs.bk
|
||||
@ -21,9 +20,3 @@ debian/nu/
|
||||
|
||||
# VSCode's IDE items
|
||||
.vscode/*
|
||||
=======
|
||||
history.txt
|
||||
/target
|
||||
/.vscode
|
||||
.DS_Store
|
||||
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
|
||||
|
Loading…
Reference in New Issue
Block a user