Accepting request 822702 from X11:XOrg

- U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
  * Fix symbols/in syntax error: spurious git conflict marker
    (boo#1174483)

OBS-URL: https://build.opensuse.org/request/show/822702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=89

U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch

@@ -0,0 +1,26 @@
+From c8d68304c826567f27f5a913dd38f6e045b81483 Mon Sep 17 00:00:00 2001
+From: Pritam Baral <pritam@pritambaral.com>
+Date: Thu, 11 Jun 2020 04:02:27 +0000
+Subject: [PATCH] Fix symbols/in syntax error: spurious git conflict marker
+
+Introduced in https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/93ea944c2599584a4dd1add1725fafd19fef2535#904fcb1a2ae93630fa2905a7fd0ced3f8e50a6e8_2329_2329
+---
+ symbols/in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/symbols/in b/symbols/in
+index 3ca78a2..b3a5ca9 100644
+--- a/symbols/in
++++ b/symbols/in
+@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" {
+ 	key <AB09> { [ period, U0964, U0965, U093d ] };
+ 	key <AB10> { [ U092f, question, slash, question ] };
+ };
+-=======
++
+ // EXTRAS:
+ 
+ //           Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.
+-- 
+2.16.4
+

xkeyboard-config.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul 24 19:08:33 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
+  * Fix symbols/in syntax error: spurious git conflict marker
+    (boo#1174483)
+
 -------------------------------------------------------------------
 Wed Jun  3 10:08:06 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 

xkeyboard-config.spec

@@ -27,6 +27,7 @@ Source:         http://xorg.freedesktop.org/archive/individual/data/%{name}/%{na
 Patch100:       n_suse-ctrl-alt-bksp-terminate.patch
 # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
 Patch109:       n_disable-2xalt_2xctrl-toggle.diff
+Patch110:       U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
@@ -54,6 +55,7 @@ make keyboards more accessible to people with physical impairments.
 #translation-update-upstream
 %patch100 -p1
 %patch109 -p1
+%patch110 -p1
 
 %build
 %configure \