From 237f016f4f8441212f85f268f0806c33fed7591b Mon Sep 17 00:00:00 2001
From: Perberos <perberos@gmail.com>
Date: Tue, 15 Nov 2011 18:51:08 -0300
Subject: fixing file conflict on battstat applet

---
 battstat/sounds/battstat_applet.soundlist.in      | 10 ----------
 battstat/sounds/mate-battstat_applet.soundlist.in | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 battstat/sounds/battstat_applet.soundlist.in
 create mode 100644 battstat/sounds/mate-battstat_applet.soundlist.in

diff --git a/battstat/sounds/battstat_applet.soundlist.in b/battstat/sounds/battstat_applet.soundlist.in
deleted file mode 100644
index a5387709..00000000
--- a/battstat/sounds/battstat_applet.soundlist.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[__section_info__]
-_description=Battery Status Utility
-
-[LowBattery]
-file=
-_description=Battery power low
-
-[BatteryFull]
-file=
-_description=Battery fully re-charged
diff --git a/battstat/sounds/mate-battstat_applet.soundlist.in b/battstat/sounds/mate-battstat_applet.soundlist.in
new file mode 100644
index 00000000..a5387709
--- /dev/null
+++ b/battstat/sounds/mate-battstat_applet.soundlist.in
@@ -0,0 +1,10 @@
+[__section_info__]
+_description=Battery Status Utility
+
+[LowBattery]
+file=
+_description=Battery power low
+
+[BatteryFull]
+file=
+_description=Battery fully re-charged
-- 
cgit v1.2.1