> Text conflict in plugins/Ubuntu/Gestures/TouchGate.cpp > Text conflict in plugins/Ubuntu/Gestures/TouchGate.h > 2 conflicts encountered.
Fixed.
« Back to merge proposal
> Text conflict in plugins/ Ubuntu/ Gestures/ TouchGate. cpp Ubuntu/ Gestures/ TouchGate. h
> Text conflict in plugins/
> 2 conflicts encountered.
Fixed.