ref: refs/heads/master commit 32eb89bc5b629092c4c1e4b207631ae05170c641 Author: Martin Kudlvasr <mkudlvasr@suse.cz> Date: Thu Oct 29 14:09:40 2009 +0100 fixed merge problem --- plugins/eulas/package/yast2-webclient-eulas.spec | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/plugins/eulas/package/yast2-webclient-eulas.spec b/plugins/eulas/package/yast2-webclient-eulas.spec index 564c0ca..3967fca 100644 --- a/plugins/eulas/package/yast2-webclient-eulas.spec +++ b/plugins/eulas/package/yast2-webclient-eulas.spec @@ -11,11 +11,7 @@ Name: yast2-webclient-eulas PreReq: yast2-webclient >= 0.0.2 -<<<<<<< HEAD:plugins/eulas/package/yast2-webclient-eulas.spec -License: GPL v2 only -======= License: GPLv2 ->>>>>>> 097a1cbfbefea6bc7b57b2408254c92fa1d36aad:plugins/eulas/package/yast2-webclient-eulas.spec Group: Productivity/Networking/Web/Utilities Autoreqprov: on Version: 0.0.6 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org