Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typo #2346

Merged
merged 1 commit into from
Feb 22, 2017
Merged

Typo #2346

merged 1 commit into from
Feb 22, 2017

Conversation

rbovard
Copy link
Contributor

@rbovard rbovard commented Feb 21, 2017

No description provided.

@fredj
Copy link
Member

fredj commented Feb 21, 2017

good catch, thanks !

@sbrunner
Copy link
Member

Should be rebase on the 2.1 branch :-)

@sbrunner sbrunner changed the base branch from master to 2.1 February 21, 2017 14:05
@rbovard
Copy link
Contributor Author

rbovard commented Feb 21, 2017

How to do that?

@sbrunner
Copy link
Member

git rebase --interactive origin/2.1

removes all lines starting with pick expect yours one :-)

@rbovard
Copy link
Contributor Author

rbovard commented Feb 21, 2017

Thanks, done.

@sbrunner
Copy link
Member

Thanks @rbovard :-)

@sbrunner sbrunner merged commit c6b0600 into camptocamp:2.1 Feb 22, 2017
@sbrunner sbrunner added this to the Older milestone Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants