Bug #8284
error on upgrading authentic2
Start date:
17 Sep 2015
Due date:
% Done:
100%
Estimated time:
Patch proposed:
Yes
Planning:
Description
On upgrade, I got the following traceback
Paramétrage de python-authentic2 (2.1.20.634.g95a6b25-1~eob70+1) ...
SyntaxError: ('invalid syntax', ('/usr/lib/python2.7/dist-packages/authentic2/saml/management/commands/sync-metadata.py', 85, 2, '<<<<<<< HEAD\n'))
SyntaxError: ('invalid syntax', ('/usr/lib/python2.6/dist-packages/authentic2/saml/management/commands/sync-metadata.py', 85, 2, '<<<<<<< HEAD\n'))
Files
Associated revisions
History
Updated by Serghei Mihai over 5 years ago
- Status changed from Nouveau to Résolu (à déployer)
- % Done changed from 0 to 100
Appliqué par commit authentic2|54f796e96c3d898f725adc14b5675533f87626f4.
Updated by Benjamin Dauvergne about 5 years ago
- Status changed from Résolu (à déployer) to Solution déployée
clean git rebase marks (fixes #8284)