diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 572dda1ac..6cd23c7b9 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,10 +1,7 @@ -<<<<<<< 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 |