Code review comment for lp:~nick-dedekind/unity8/indicators-client-textual-app

Some unsolved merge conflicts

200 +<<<<<<< TREE
201 menucontentactivator.cpp
202 +=======
203 + modelprinter.cpp
204 +>>>>>>> MERGE-SOURCE

369 +<<<<<<< TREE
370 #include "menucontentactivator.h"
371 +=======
372 +#include "modelprinter.h"
373 +>>>>>>> MERGE-SOURCE

381 +<<<<<<< TREE
382 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
383 +=======
384 + qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
385 +>>>>>>> MERGE-SOURCE