diff options
| author | ennael <ennael@mageia.org> | 2013-09-04 20:34:31 +0200 |
|---|---|---|
| committer | ennael <ennael@mageia.org> | 2013-09-04 20:34:31 +0200 |
| commit | 21e111d3ac710368c63485f8c4b37509212b825c (patch) | |
| tree | fa4641500d204b3e1da09ff909a21e14a34badb7 | |
| parent | ff13b8fe1d35fc268b056332e73ed552c54fc2eb (diff) | |
| download | drakx-21e111d3ac710368c63485f8c4b37509212b825c.tar drakx-21e111d3ac710368c63485f8c4b37509212b825c.tar.gz drakx-21e111d3ac710368c63485f8c4b37509212b825c.tar.bz2 drakx-21e111d3ac710368c63485f8c4b37509212b825c.tar.xz drakx-21e111d3ac710368c63485f8c4b37509212b825c.zip | |
fix conflict
| -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 |