From aeac9986c1e64bb3e4a55f6720ad1e610636380a Mon Sep 17 00:00:00 2001
From: Michael Toksvig <tox@fb.com>
Date: Thu, 15 Sep 2016 13:36:22 -0700
Subject: [PATCH] @already-on-github resolve conflict between dot_gitignore and
 .gitignore

Summary: #accept2ship

Reviewed By: fbriggs

Differential Revision: D3872457

fbshipit-source-id: b6de5cd0522330fcb0319c7dc5b7b5875e12c4e3
---
 surround360_render/.gitignore | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/surround360_render/.gitignore b/surround360_render/.gitignore
index 9adb23a3..b8398e28 100644
--- 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/