Remove conflict markers
favogt created request about 2 months ago
lwfinger accepted request about 2 months ago
reviewed ok.
larryr
lwfinger
The Open Build Service is an openSUSE project.