[tmux/el6: 16/16] fix conflicts

[Sven Lankes]

commit eb1d409c5e9f9b6304d67e3e8c9612f076f68b88
Merge: 8806434 d659dac
Author: Sven Lankes <sven at lank.es>
Date:   Tue Nov 1 11:32:50 2011 +0100

    fix conflicts

 sources   |    2 +-
 tmux.spec |   44 ++++++++++++++++++++------------------------
 2 files changed, 21 insertions(+), 25 deletions(-)
---