master + 0.50 branch both have git merge conflicts checked in

[Chaircrusher]

For example src/FormantFilter.cpp:234:1: error: expected primary-expression before ‘<<’ token <<<<<<< HEAD ^ src/FormantFilter.cpp:234:3: error: expected primary-expression before ‘<<’ token <<<<<<< HEAD ^ src/FormantFilter.cpp:234:5: error: expected primary-expression before ‘<<’ token <<<<<<< HEAD ^ src/FormantFilter.cpp:234:7: error: expected primary-expression before ‘<’ token

[AmateurExpert]

And:

src/Autodafe.hpp:7:1: error: version control conflict marker in file <<<<<<< HEAD ^~~ src/Autodafe.hpp:20:8: error: ‘Plugin’ does not name a type extern Plugin *plugin; ^~ src/Autodafe.hpp:23:1: error: version control conflict marker in file <<<<<<< HEAD ^~~ ../../compile.mk:53: recipe for target 'build/src/Phaser.cpp.o' failed make: *** [build/src/Phaser.cpp.o] Error 1

[briansorahan]

@antoniograzioli Do you plan to support these modules?

[antoniograzioli]

last time I tried to sync my local copy with this reposomething got worng, and everything was messed up...I need to erase the repo and reupload everything...