From 17a484fc80ca855f4dd82b877600ffb937543017900e662be0c875b191c8e917 Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Thu, 16 Jun 2016 13:49:14 +0000
Subject: [PATCH] Fix changelog.

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

diff --git a/tigervnc.changes b/tigervnc.changes
index c0a3657..8c9780f 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -11,7 +11,6 @@ Mon Jun 13 15:21:19 UTC 2016 - msrb@suse.com
   * Fix zlib stream reset in tight encoding. (bnc#963417)
 
 -------------------------------------------------------------------
->>>>>>> ./tigervnc.changes.rb2c0921742fcc34e855cefa0bc741324
 Tue May 24 12:46:07 UTC 2016 - msrb@suse.com
 
 - Add /etc/pam.d/vnc configuration and add vnc user to shadow