From 30332d72c1fc31b6a71542650182faeb2237683d Mon Sep 17 00:00:00 2001
From: hillwood <hillwood@hillwood-opensuse.(none)>
Date: Tue, 19 Feb 2013 00:07:51 +0800
Subject: Fix files conflict with gnome-dropbox.

---
 data/icons/hicolor/24x24/apps/caja-dropbox.png | Bin 0 -> 1684 bytes
 data/icons/hicolor/24x24/apps/dropbox.png      | Bin 1684 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 data/icons/hicolor/24x24/apps/caja-dropbox.png
 delete mode 100644 data/icons/hicolor/24x24/apps/dropbox.png

(limited to 'data/icons/hicolor/24x24/apps')

diff --git a/data/icons/hicolor/24x24/apps/caja-dropbox.png b/data/icons/hicolor/24x24/apps/caja-dropbox.png
new file mode 100644
index 0000000..c4c7e45
Binary files /dev/null and b/data/icons/hicolor/24x24/apps/caja-dropbox.png differ
diff --git a/data/icons/hicolor/24x24/apps/dropbox.png b/data/icons/hicolor/24x24/apps/dropbox.png
deleted file mode 100644
index c4c7e45..0000000
Binary files a/data/icons/hicolor/24x24/apps/dropbox.png and /dev/null differ
-- 
cgit v1.2.1