Commit e9c027ba authored by Andrey Filippov's avatar Andrey Filippov

after auto

parents 473a5121 627cce33
bin
tmp
*.directory
#src/com/elphel/vdt/veditor
#_generated
#src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html
ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt
cocotb
<<<<<<< HEAD
_generated_*
src/com/elphel/vdt/veditor
......@@ -16,3 +14,8 @@ src/com/elphel/vdt/core/launching/VDTErrorParser.java
about_veditor.html
ChangeLogVeditor.txt
CONTRIBUTORS_VEDITOR.txt
=======
src/com/elphel/vdt/veditor
_generated
src/com/elphel/vdt/core/launching/VDTErrorParser.java
>>>>>>> 627cce33007b66f00dc7bdab8f1c567ad7577b23
This diff is collapsed.
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