SHA256
1
0
forked from pool/tigervnc

removed conflict marker ...

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=162
This commit is contained in:
Stefan Dirsch 2019-04-20 15:38:30 +00:00 committed by Git OBS Bridge
parent f1e01fdf7c
commit 0e510583f4

View File

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