fix conflicts
fcrozat created request almost 3 years ago
dfaggioli accepted request almost 3 years ago
dfaggioli
dmacvicar
The Open Build Service is an openSUSE project.