[tmux/f13/master] fix my 2nd error

[Filipe Rosset]

commit 2570dda7735e61860edf8be659b101b8fb11c76b
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Fri Aug 6 01:24:11 2010 -0300

    fix my 2nd error

 sources |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 83d95f3..02c6ba3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 748fbe7bb5f86812e19bd6005ff21a5a  tmux-1.2.tar.gz
-=======
 96e60cb206de2db0610b9fb6a64c2251  tmux-1.3.tar.gz
->>>>>>> master