From bc1f7068b72300ed4ca0ae4e85a413f314cf98ee Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Sun, 25 Mar 2012 01:47:42 +0000
Subject: [PATCH] Merge

git-svn-id: https://radegast.googlecode.com/svn/trunk@1255 f7a694da-4d33-11de-9ad6-1127a62b9fcd
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ab47dd5..2719fa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@ obj
 compile.bat
 *.sln
 *.csproj
+<<<<<<< HEAD
 *.bak
 *~
-- 
2.11.0