From 7a41d2b222c02a552acd2041ab301c09ee883fa5 Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Sun, 24 Apr 2016 17:55:59 +0300
Subject: [PATCH] plymouth actions fix

---
 system/boot/plymouth/actions.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/system/boot/plymouth/actions.py b/system/boot/plymouth/actions.py
index c9bec03aaa..c2c8f91e8a 100644
--- a/system/boot/plymouth/actions.py
+++ b/system/boot/plymouth/actions.py
@@ -35,14 +35,7 @@ def setup():
                          --disable-tests \
                          --disable-static \
                          --enable-gdm-transition \
-<<<<<<< HEAD
                          --without-rhgb-compat-link" % LOGO_FILE)
-    
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
-=======
-                         --without-rhgb-compat-link \
-                         --without-gdm-autostart-file" % LOGO_FILE)
->>>>>>> parent of 84b30c3... revert
 
 def build():
     autotools.make()