fix merge conflict #1

Closed

willem wants to merge 0 commits from merge_confict into master

pull from: merge_confict

merge into: projects:master

projects:master

Conversation 0 Commits - Files Changed -

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files Hide outdated comments

Diff Content Not Available