Skip to content
Snippets Groups Projects
Commit bf0e4d73 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix launchpad conflicts

parent 0b51eff5
No related branches found
No related tags found
No related merge requests found
...@@ -96,11 +96,11 @@ https://launchpad.net/dolibarr/stable ...@@ -96,11 +96,11 @@ https://launchpad.net/dolibarr/stable
lp:dolibarr lp:dolibarr
merge packaging lp:~yourlogin/+junk/debian-dev merge packaging lp:~yourlogin/+junk/debian-dev
For beta: For beta:
# bzr-builder format 0.3 deb-version {debupstream}-0~{revno} # bzr-builder format 0.3 deb-version {debupstream}-1~{revno}
lp:dolibarr/beta lp:dolibarr/beta
merge packaging lp:~yourlogin/+junk/debian-beta merge packaging lp:~yourlogin/+junk/debian-beta
For stable: For stable:
# bzr-builder format 0.3 deb-version {debupstream}-0~{revno} # bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
lp:dolibarr/stable lp:dolibarr/stable
merge packaging lp:~yourlogin/+junk/debian-stable merge packaging lp:~yourlogin/+junk/debian-stable
- Run command - Run command
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment