@already-on-github resolve conflict between dot_gitignore and .gitignore

Summary: #accept2ship Reviewed By: fbriggs Differential Revision: D3872457 fbshipit-source-id: b6de5cd0522330fcb0319c7dc5b7b5875e12c4e3
teknomadix · Sep 17, 2016 · aeac998 · aeac998
1 parent 361162c
commit aeac998
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/surround360_render/.gitignore b/surround360_render/.gitignore
@@ -1,6 +1,9 @@
-/CMakeCache.txt
-/cmake_install.cmake
-/CMakeFiles/
-/Makefile
-/bin/
-/lib/
+Makefile
+bin/
+lib/
+*.[pyc]
+*.[pyo]
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+local/