X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=.gitignore;h=676af957a731a90fe3c66f1c0710f2c5d79fa91b;hb=d5dc7c368b91bfc0c7860640196b4dfde90ae65a;hp=2719fa003842a6bc2d92460a2062f26b398f73ff;hpb=bc1f7068b72300ed4ca0ae4e85a413f314cf98ee;p=radegast%2Fradegast.git

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