1 year ago · 47d3762ee2
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,9 @@ UnitTests/TestResults
 
															 TestResults
														
 
															 # git merge files
														
 
															-.orig
														
 
															-.theirs
														
 
															-.ours
														
 
															+*.orig
														
 
															+*.theirs
														
 
															+*.ours
														
 
															 demo.*