diff options
| author | Arnaud Desmons <adesmons@mandriva.com> | 2002-08-19 12:31:14 +0000 |
|---|---|---|
| committer | Arnaud Desmons <adesmons@mandriva.com> | 2002-08-19 12:31:14 +0000 |
| commit | 1f2bd337274b233328044d71210717627861df94 (patch) | |
| tree | d7ed15b810e4871bc53ba95e36f319d6f201f69f | |
| parent | 7dde5fbdf5daa54124810d8e55d3fe5262f201b9 (diff) | |
| download | drakwizard-1f2bd337274b233328044d71210717627861df94.tar drakwizard-1f2bd337274b233328044d71210717627861df94.tar.gz drakwizard-1f2bd337274b233328044d71210717627861df94.tar.bz2 drakwizard-1f2bd337274b233328044d71210717627861df94.tar.xz drakwizard-1f2bd337274b233328044d71210717627861df94.zip | |
conflict
| -rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -34,12 +34,9 @@ clean: rm -f *~ tar: clean -<<<<<<< Makefile - cd .. ; ln -s wizard_perl $(NAME); tar cf - $(NAME) | bzip2 -9 >$(TAR) -======= cd ..; cp -rf wizard_perl $(NAME) cd ..; tar cf - $(NAME) | bzip2 -9 > $(TAR) ->>>>>>> 1.7 + cd ..; rm -rf $(NAME) rpm: tar cp -f ../$(TAR) $(RPM)/SOURCES |