Skip to content

V
vdt-plugin
Commit 13ce7482 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

modified autogenerated .gitignore

parents 06fe18af 9e91b74e
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
.gitignore
View file @ 13ce7482
bin bin
tmp tmp
*.directory *.directory
#src/com/elphel/vdt/veditor
#_generated
#src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html about_veditor.html
ChangeLogVeditor.txt ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt CONTRIBUTORS_VEDITOR.txt
cocotb cocotb
<<<<<<< HEAD
src/com/elphel/vdt/veditor src/com/elphel/vdt/veditor
_generated _generated
...@@ -15,3 +13,8 @@ src/com/elphel/vdt/core/launching/VDTErrorParser.java ...@@ -15,3 +13,8 @@ src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html about_veditor.html
ChangeLogVeditor.txt ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt CONTRIBUTORS_VEDITOR.txt
=======
src/com/elphel/vdt/veditor
_generated
src/com/elphel/vdt/core/launching/VDTErrorParser.java
>>>>>>> 9e91b74e620e5d70cd2445a7e6f71626cdb81af1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment