[tinc] Merged with local copy

[Fabian Affolter]

commit 2287947602ab50c67196fd178c57f97bf9f10e7f
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Tue Jun 26 19:57:00 2012 +0200

    Merged with local copy

 tinc.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/tinc.spec b/tinc.spec
index 527c1f3..1b86f58 100644
--- a/tinc.spec
+++ b/tinc.spec
@@ -64,7 +64,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Tue Jun 26 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.19-1
 - Updated to new upstream version 1.0.16