[lv2-triceratops] Correct typo

[Brendan Jones]

commit bcc457a4cd0191a84b95f28db0d51fd7e15a3ba6
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sun May 26 18:31:29 2013 +0200

    Correct typo

 lv2-triceratops.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/lv2-triceratops.spec b/lv2-triceratops.spec
index 749ec52..4e9ec79 100644
--- a/lv2-triceratops.spec
+++ b/lv2-triceratops.spec
@@ -1,5 +1,4 @@
 Name:           lv2-triceratops
-<<<<<<< HEAD
 Version:        0.1.6
 Release:        1%{?dist}
 Summary:        An LV2 polyphonic synthesizer
@@ -52,7 +51,6 @@ rm  -rf %{buildroot}%{_libdir}/lv2/triceratops-presets.lv2/.directory
 %{_libdir}/lv2/triceratops-presets.lv2
 
 %changelog
-<<<<<<< HEAD
 * Sun May 26 2013 Brendan Jones <brendan.jones.it at gmail.com> 0.1.6-1
 - New upstream release