##// END OF EJS Templates
chore: fixed merge conflicts
chore: fixed merge conflicts

File last commit:

r2623:0cd3ef36 default
r5546:50cf7822 merge v5.2.0 stable
Show More
compat.py
1 line | 39 B | text/x-python | PythonLexer
code: code fixes and small adjustments
r2623 from pyramid.compat import configparser