From 0e510583f486bf4d1ca59ae6152d8322510d95448acfd17eb63d1e6b944d8e2c Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 20 Apr 2019 15:38:30 +0000
Subject: [PATCH] removed conflict marker ...

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=162
---
 tigervnc.changes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tigervnc.changes b/tigervnc.changes
index e333a6d..bb443c1 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -33,7 +33,6 @@ Thu Mar 21 09:16:51 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
   runtime.
 
 -------------------------------------------------------------------
->>>>>>> ./tigervnc.changes.r85a118aa653f1d42c31302a788064076
 Thu Feb  7 12:34:03 UTC 2019 - Stephan Kulow <coolo@suse.com>
 
 - Fix build with latest cmake - which now requires the source