Pull changes from @mahowi and @int2001

probonopd / RF100-Firmware

Conrad Electronic Renkforce RF100 Firmware

GNU General Public License v3.0

7 stars 5 forks source link

Closed probonopd closed 6 years ago

probonopd commented 6 years ago

Running into issues merging this when trying to follow the instructions:

$ git merge --no-ff int2001-stable
merge: int2001-stable - not something we can merge

probonopd commented 6 years ago

How can I apply this PR while leaving .travis.yml unchanged? cc @TheAssassin

TheAssassin commented 6 years ago

Just get the original file and commit it.