maofalt / Transcendence

4 stars 0 forks source link

removed unresolved conflict that breaks main #102

Closed YoelRidgway closed 7 months ago

abravo31 commented 7 months ago

It was just a small mistake and now it is fixed