Resolve merge conflict in .gitattributes

ebelski / rust-copter

A quadcopter build using a Teensy running Rust and some other cool stuff that's yet to be determined.

MIT License

6 stars 1 forks source link

Resolve merge conflict in .gitattributes #25

Closed mciantyre closed 4 years ago

mciantyre commented 4 years ago

Looks like we checked-in a merge conflict in the .gitattributes file, which is used by git lfs. It manifested when I pulled master, and my git client threw a fit about the motor test fixture files.

mciantyre commented 4 years ago

Diff shows a delta on the models. But, they're unchanged; they're transitioned to LFS now.