tesla893/RapCAD — comment on commit 42ad5ce73e84dcac715cf0592e6337406b5360b9
File:  line 0
By GilesBathgate:

I think you might have fixed up these merge conflicts incorrectly. It might be better if you just do:

git remote add rapcad git@github.com:GilesBathgate/RapCAD.git
git reset --hard 76cbb6db4103a06713d2c0247092977f6a6e54da
git pull rapcad
git push --force origin

Or something like that