Merge branch 'RAD-498' of https://github.com/nooperation/radegast into nooperation...

[radegast/radegast.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2719fa0..676af95 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,9 @@ bin
 obj
 compile.bat
 *.sln
+*.sln.cache
 *.csproj
-<<<<<<< HEAD
 *.bak
+*.resources
 *~
+*.userprefs