This file is in conflict in this state; the markers below are the conflict.
All conflicts
| 648724d8 unknown ↶ |
1 |
# Oxygen |
| 2 |
|
| 576e1191 Andy McCall ↶ |
3 |
<<<<<<< oxy conflict 1 of 1, side 1 of 2: change c70d345e "README: mention Rust" |
| 91bfb51f Andy McCall ↶ |
4 |
A distributed, commutative version control system written in Rust. See docs/spec.md. |
|
5 |
======= oxy conflict 1 of 1, side 2 of 2: change 11d9a56f "README: mention large repositories" |
|
6 |
A distributed, commutative version control system for large repositories. See docs/spec.md. |
|
7 |
>>>>>>> oxy conflict 1 of 1 end |