From 5aebfb0d2c239c84ec92ac29d1f8fd9112dd7969 Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Fri, 6 Aug 2021 14:28:28 +0200
Subject: [PATCH] Remove merge signs from specfile

---
 libyang.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libyang.spec b/libyang.spec
index 7a8d0f4..a8e080b 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -99,7 +99,6 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
 %files devel-doc
 %{_docdir}/libyang/
 
-<<<<<<< HEAD
 %files cpp
 %{_libdir}/libyang-cpp.so.%{somajor}{,.*}