Code review comment for lp:~gerboland/qtubuntu/enable-debug-mode

Daniel d'Andrada (dandrader) wrote :

Lot's of conflicts with trunk:

"""
Text conflict in src/ubuntumirclient/integration.cpp
Text conflict in src/ubuntumirclient/integration.h
Text conflict in src/ubuntumirclient/window.cpp
Text conflict in src/ubuntumirclient/window.h
4 conflicts encountered.
"""

review: Needs Fixing

« Back to merge proposal