The Nest
Explore
398
The sound distributed version control system

#680 Conflicts in `credit.rs`

Closed on May 14, 2022
quickdudley added a change on May 12, 2022
Resolve conflicts
ISF7PZQTDXWSAGRN4QY7I4ODPRPCF4NBVKUYU7K3SEJOXK33HE2QC
pmeunier on May 14, 2022

There was also a problem in Libpijul leading to these conflicts, I fixed those yesterday (and the original conflict).

pmeunier closed this discussion on May 14, 2022