summaryrefslogtreecommitdiff
path: root/tests/update_fixtures/osctest/services/.osc/merge
blob: 0b4685d52e79e53ebe2c567f0d58d91e1529e5c7 (plain)
1
2
3
4
Is it
possible to
merge this file?
I hope so...