abcxyz / abc

Apache License 2.0
12 stars 3 forks source link

fix merge conflict instructions #631

Open drevell opened 2 months ago

drevell commented 2 months ago

This logic was changed a few weeks ago but the instructions werent updated accordingly.