[mate-file-manager/f16] update source

[Dan Mashal]

commit 475fb765536c1ad49526bd72cbb0a42d228c5ca5
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Nov 19 07:35:31 2012 -0800

    update source

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 7682c28..cce7586 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-82403e57f167dd474ada357b2c75758a  mate-file-manager-1.4.0.tar.xz
-=======
 3cc757b5a08753e95e29aa65cec615d9  mate-file-manager-1.5.0-GIT.tar.gz
->>>>>>> master