Closed PennyJim closed 2 months ago
You accidentally undid some of my changes, so I redid them
You also accidentally undid some of your changes, so I redid them
Please pull from origin before doing anything next time :) That way you shouldn't have to deal with the chaos that is the merge editor.
You accidentally undid some of my changes, so I redid them
You also accidentally undid some of your changes, so I redid them
Please pull from origin before doing anything next time :) That way you shouldn't have to deal with the chaos that is the merge editor.