Conflicts: git/gitignore
@@ -5,6 +5,4 @@
.*.swp
.ycm_extra_conf.py
.~lock.*#
-CMakeCache.txt
-CMakeFiles
-cmake_install.cmake
+*.egg-info