ignoring *.orig files from mercurial merges · f46115e794 - Gogs

ignoring *.orig files from mercurial merges

fysx 11 years ago

parent

29a3e4b566

commit

f46115e794

1 changed files with 1 additions and 0 deletions

Unified View Show Diff Stats

						
							+ 1
							
							- 0
						
.gitignore
							 
								View File
							
															@@ -12,6 +12,7 @@ local.properties
														
															 *.o
														
															 *.o
														
															 *.so
														
															 *.so
														
															 *.a
														
															 *.a
														
															+*.orig
														
															 !jni/LuaJIT-2.0.1/android/armeabi/libluajit.a
														
															 !jni/LuaJIT-2.0.1/android/armeabi/libluajit.a
														
															 !jni/LuaJIT-2.0.1/android/armeabi-v7a/libluajit.a
														
															 !jni/LuaJIT-2.0.1/android/armeabi-v7a/libluajit.a