From ff13b8fe1d35fc268b056332e73ed552c54fc2eb Mon Sep 17 00:00:00 2001
From: ennael <ennael@mageia.org>
Date: Wed, 4 Sep 2013 18:35:15 +0200
Subject: Revert "stage2: add images for LXDE,E17,Razorqt,MATE"

This reverts commit 67bc2a78c587ab4659c0f0e936d2eb98573136aa.

Conflicts:
	perl-install/NEWS
---
 perl-install/NEWS | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'perl-install/NEWS')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6cd23c7b9..572dda1ac 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,7 +1,10 @@
+<<<<<<< HEAD
 - fix drakauth ldap configuration (mga#10005)
 - ensure files are installed for nfs (mga#10301)
 - stage2: add Feature:Independently_install_desktop_environments
 - add images for LXDE,E17,Razorqt,MATE for Feature:Independently_install_desktop_environments
+=======
+>>>>>>> parent of 67bc2a7... stage2: add images for LXDE,E17,Razorqt,MATE
 - detect wifi cards managed by ssb driver (mga#9378)
 
 Version 15.57 - 16 July 2013
-- 
cgit v1.2.1