Trying to resolve a confliction

Jasmarkelina / Tantros-Mod

A mindustry Tantros mod made by Jasmarkelina

19 stars 7 forks source link

Closed Jasmarkelina closed 1 year ago

Jasmarkelina commented 1 year ago

adsadarfes

Jasmarkelina commented 1 year ago

woof

Plastel commented 1 year ago

this conflict is painful to solve

Jasmarkelina commented 1 year ago

Yeah, I have to download Git and use its command line to fix the conflicts