| 1 | # oxygen#145: two changes that each add a changelog entry in the same |
| 2 | # place keep both, without a conflict. |
| 3 | CHANGELOG.md merge=union |
| 1 | # oxygen#145: two changes that each add a changelog entry in the same |
| 2 | # place keep both, without a conflict. |
| 3 | CHANGELOG.md merge=union |