Unity 8

Code review comment for lp:~josharenson/unity8/fix-greeter-password-focus

  1. fix-greeter-password-focus
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.BASE.moved.moved.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.OTHER.moved.moved.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved.moved.moved.
Conflict adding file plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved.moved.moved. Moved existing file to plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt.THIS.moved.moved.moved.moved.moved.moved.moved.
22 conflicts encountered.

« Back to merge proposal