yannweb/lodel2_mirror
1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2026-08-03 19:08:37 +02:00
Code Releases Activity

Unresolved conflict in previous rebase commit

Browse source
This commit is contained in:
Yann 2016-07-07 17:42:49 +02:00
commit 921ec3c25a
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lodel/auth/auth.py
View file

@ -215,14 +215,8 @@ class Auth(object):
Settings.auth.pass_classfield)
res_infos = []
for clsname, fieldname in infos:
<<<<<<< HEAD
res_infos.append((
dyncode.lowername2class(infos[0]),
dcls.field(infos[1]))) # TODO cls.field ?
=======
dcls = dyncode.lowername2class(infos[0][0])
res_infos.append((dcls, infos[1][1]))
>>>>>>> Plug webui to auth
link_field = None
if res_infos[0][0] != res_infos[1][0]: