[tntnet/f18] new release

[Martin Gansser]

commit 685f18135be84c2a0219df230c4b37ed4393f347
Author: Martin Gansser <mgansser at alice.de>
Date:   Fri May 3 22:02:13 2013 +0200

    new release
    
    - spec file cleanup

 clog        |    4 +---
 tntnet.spec |    8 --------
 2 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/clog b/clog
index 7e0380e..73072cf 100644
--- a/clog
+++ b/clog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
+new release
 
-=======
-- new release
 - spec file cleanup
diff --git a/tntnet.spec b/tntnet.spec
index 184c7b5..dcbead9 100644
--- a/tntnet.spec
+++ b/tntnet.spec
@@ -1,11 +1,6 @@
 Name:             tntnet
-<<<<<<< HEAD
-Version:          2.1
-Release:          15%{?dist}
-=======
 Version:          2.2
 Release:          1%{?dist}
->>>>>>> master
 Summary:          A web application server for web applications
 
 # GPLv2+: framework/common/gcryptinit.c
@@ -101,13 +96,10 @@ exit 0
 %{_includedir}/tnt/
 
 %changelog
-<<<<<<< HEAD
-=======
 * Fri May 3 2013 Martin Gansser <<martinkg at fedoraproject.org> - 2.2-1
 - new release
 - spec file cleanup
 
->>>>>>> master
 * Thu Aug 23 2012 Martin Gansser <linux4martin at gmx.de> - 2.1-15
 - fixed typos in tntnet spec file