I can't resolve the conflict because me and a fellow developer have both made changes on the CSS file on our computer, before trying to commit it to the Team Server.
↧
I can't resolve the conflict because me and a fellow developer have both made changes on the CSS file on our computer, before trying to commit it to the Team Server.