[gnome-sound-recorder] Updated POTFILES.in

[Piotr Drąg <piotrdrag src gnome org>]

commit a742bb9cdf911a7f3753f22bd3681495aab662f1
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Thu Sep 26 00:25:19 2013 +0200

    Updated POTFILES.in

 po/POTFILES.in |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e258a99..6d23ab5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
-data/gnome-sound-recorder.desktop.in.in
 data/org.gnome.gnome-sound-recorder.gschema.xml
-=======
 data/org.gnome.SoundRecorder.desktop.in.in
-src/main.js
-src/util.js
-src/mainWindow.js
->>>>>>> rename the desktop file
 src/audioProfile.js
 src/fileUtil.js
 src/info.js