I just synch'd my fork with the copter-3.5 branch and received this error when attempting to compile the code. I had to resolve some merge conflict but the only merge conflict I had in that library was with the Display_SH1106_I2C.cpp file. Here is a link to my fork
this is the first time I have tried to update my fork to make it current with the ardupilot repository. any help would be appreciated. below is the listing of the error.
/home/sitl/ardupilot/libraries/AP_Notify/Display_SSD1306_I2C.cpp:43:1: error: redefinition of 'Display_SSD1306_I2C::~Display_SSD1306_I2C()'
compilation terminated due to -Wfatal-errors.
make: *** [/tmp/ArduCopter.build/libraries/AP_Notify/Display_SSD1306_I2C.o] Error 1