Request 685554 (accepted)

This request supersedes: request 685338 (Show diff)

- Add Conflict markers for file-based conflicts identified
by repo-checker.
- Update to new upstream release 2019.03.11

author reviewer source maintainer

@Guillaume_G Conflicts are added, this should make 15.1 happy too.

- Add Conflict markers for file-based conflicts identified
by repo-checker.
- Update to new upstream release 2019.03.11

factory-auto added opensuse-review-team as a reviewer over 5 years ago

Please review sources

Check script succeeded

staging-bot set openSUSE:Factory:Staging:H as a staging project over 5 years ago

Being evaluated by staging project "openSUSE:Factory:Staging:H"

Picked openSUSE:Factory:Staging:H

ready to accept

ready to accept

Accept to openSUSE:Factory