va3wam / TWIPe

This repository contains the embedded code used for the TWIPe robot
MIT License
2 stars 0 forks source link

duplicate d-3angles in d-v13 #36

Closed nerdoug closed 4 years ago

nerdoug commented 4 years ago

seems strange that merge doesn't have conflicts?

nerdoug commented 4 years ago

oops. I accidentally ended up with main.cpp.txt due to way I restored my changed code. Need to abort this pull request, and I think that's what the "Close and comment" button does if you haven't done the merge.