Skip to content

Bug fix/#59&#61#119

Merged
webframp merged 4 commits into
MobileOrg:developfrom
mgmart:bug-fix/#59&#61
Jan 7, 2017
Merged

Bug fix/#59&#61#119
webframp merged 4 commits into
MobileOrg:developfrom
mgmart:bug-fix/#59&#61

Conversation

@mgmart
Copy link
Copy Markdown
Member

@mgmart mgmart commented Jan 7, 2017

Not tested with WebDAV!

@webframp
Copy link
Copy Markdown
Member

webframp commented Jan 7, 2017

Oops, merge conflicts here. @mgmart Can you resolve those and update or do you want me to handle it?

@mgmart
Copy link
Copy Markdown
Member Author

mgmart commented Jan 7, 2017

If you would be so kind :)
It's the 'develop' part which is correct.
Conflict occurs because my branch didn't know about Jamies' which is merged meanwhile.

@webframp webframp merged commit 4046881 into MobileOrg:develop Jan 7, 2017
@mgmart mgmart deleted the bug-fix/#59&#61 branch January 8, 2017 05:06
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.

2 participants