[mate-panel] 02/07: Revert "debian/patches: Add debian/patches/0001_no_scale.patch."

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository mate-panel.

commit 2a1f3f6c2aede09fcf908a9d136ac68b5cf48ad4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 25 11:33:53 2017 +0200

    Revert "debian/patches: Add debian/patches/0001_no_scale.patch."
    
    This reverts commit 3d3ad0e41fd00777cb485c3dae9b3d5ebf9097a0.
---
 debian/patches/0001_no_scale.patch | 14 --------------
 debian/patches/series              |  5 -----
 2 files changed, 19 deletions(-)

diff --git a/debian/patches/0001_no_scale.patch b/debian/patches/0001_no_scale.patch
deleted file mode 100644
index 967f3ce..0000000
--- a/debian/patches/0001_no_scale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/mate-panel/main.c b/mate-panel/main.c
-index 8355a22..e3241bc 100644
---- a/mate-panel/main.c
-+++ b/mate-panel/main.c
-@@ -84,6 +84,9 @@ main (int argc, char **argv)
- 
- 	gtk_init (&argc, &argv);
- 
-+    /* FIXME: High dpi scaling does not work... */
-+    gdk_x11_display_set_window_scale (gdk_display_get_default (), 1);
-+
- 	error = NULL;
- 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
- 		g_printerr ("%s\n", error->message);
diff --git a/debian/patches/series b/debian/patches/series
index bdf21df..c730719 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
 0001_memleak-fix.patch
 1000_prevent_menubar_destruction_when_enabling_global_menus.patch
-<<<<<<< HEAD
-=======
-0000_add_gsettings_key_to_enable_sni.patch
-0001_no_scale.patch
->>>>>>> f90bbb1... debian/patches: Add debian/patches/0001_no_scale.patch.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-panel.git