extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-28 19:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

gitignore conflict fix

Browse Source
This commit is contained in:
JT 2022-02-08 09:23:41 -05:00
parent 5fabfda57b
commit 101f4f62a8
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
/target /target
/scratch /scratch
**/*.rs.bk **/*.rs.bk
@ -21,9 +20,3 @@ debian/nu/
# VSCode's IDE items # VSCode's IDE items
.vscode/* .vscode/*
=======
history.txt
/target
/.vscode
.DS_Store
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce