Github you're stupid

Browse Source

No merge conflicts but you say:
```
This branch has conflicts that must be resolved
```
😫

...

This commit is contained in:

Robert Schäfer 2019-07-31 15:55:13 +02:00

parent c1a13f3e0a

commit a96437e54c

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available