Ubuntu Single Sign On Client

Code review comment for lp:~alecu/ubuntu-sso-client/timestamp-autofix-1-2

  1. timestamp-autofix-1-2
  2. Merge into stable-1-2
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

Text conflict in setup.py
Text conflict in ubuntu_sso/account.py
Text conflict in ubuntu_sso/credentials.py
Text conflict in ubuntu_sso/tests/test_credentials.py
Text conflict in ubuntu_sso/utils/__init__.py
Text conflict in ubuntu_sso/utils/tests/test_oauth_headers.py
Text conflict in ubuntu_sso/utils/tests/test_txsecrets.py
7 conflicts encountered.

review: Needs Fixing

« Back to merge proposal