From 121f6d04faedad570e6ce1d8d7e235b55c2a9048 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Sun, 6 Nov 2011 21:12:23 +0200
Subject: [PATCH] fixed conflicts

---
 app/assets/images/ajax-loader.gif | Bin 6820 -> 0 bytes
 public/favicon.ico                | Bin 0 -> 1150 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 public/favicon.ico

diff --git a/app/assets/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif
index 0ca7ada..c97ec6e 100644
Binary files a/app/assets/images/ajax-loader.gif and b/app/assets/images/ajax-loader.gif differ
diff --git a/public/favicon.ico b/public/favicon.ico
old mode 100644
new mode 100755
index e69de29..4ec0d29
Binary files a/public/favicon.ico and b/public/favicon.ico differ
--
libgit2 0.21.2