[Lunar-commits] <moonbase> wpa_supplicant: fix the BUILD file

[Florin Braescu]

commit 761fef86dd0d9bab10e06eaef1118389d58110ce
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Wed Sep 15 14:35:13 2010 +0300

    wpa_supplicant: fix the BUILD file
---
 wifi/wpa_supplicant/BUILD |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/wifi/wpa_supplicant/BUILD b/wifi/wpa_supplicant/BUILD
index 564f7c8..429497c 100644
--- a/wifi/wpa_supplicant/BUILD
+++ b/wifi/wpa_supplicant/BUILD
@@ -18,13 +18,8 @@
   prepare_install  &&
   make install     &&
 
-<<<<<<< HEAD
   install -m644 dbus/dbus-wpa_supplicant.conf /etc/dbus-1/system.d/  &&
   install -m644 wpa_supplicant.conf /etc/wpa_supplicant.conf.example  &&
-=======
-  install -m644 dbus-wpa_supplicant.conf /etc/dbus-1/system.d/  &&
-  install -m644 dbus\wpa_supplicant.conf /etc/wpa_supplicant.conf.example  &&
->>>>>>> 2247391b3ff282f50eb264f2bdf359bdce84c19f
 
   gather_docs developer.txt wpa_supplicant.conf