Completeing gitignore merge

sohils · sohils · commit 9fcb9b5104ef · 2019-04-05T00:41:21.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,7 @@
 cuboid_detection/bags/*
-<<<<<<< HEAD
-*.vscode/*
-=======
 
 .vscode/
 
->>>>>>> f7cfb4a0a4d54544ec4823ea02f1760c63035850
 # Prerequisites
 *.d
 
