[btm] Fix a merge conflict

[Andy Grimm]

commit 317fd0b01affb0f5fd5853b210caa41642a7c0d7
Author: Andy Grimm <agrimm at gmail.com>
Date:   Fri Jan 13 14:23:44 2012 -0500

    Fix a merge conflict

 btm.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/btm.spec b/btm.spec
index 03762e7..11c01f5 100644
--- a/btm.spec
+++ b/btm.spec
@@ -1,12 +1,7 @@
 Summary:        Bitronix Transaction Manager
 Name:           btm
-<<<<<<< HEAD
 Version:        2.1.2
 Release:        1%{?dist}
-=======
-Version:        2.1.1
-Release:        4%{?dist}
->>>>>>> 5a47c9f8e1ce5ab337e1421a425d5f818888eb2b
 Epoch:          0
 License:        LGPLv3
 URL:            http://bitronix.be