[Checkins] [zopefoundation/Zope] 84020e: resolve merge conflicts
Dieter Maurer
noreply at github.com
Fri Mar 27 10:29:17 CET 2020
Branch: refs/heads/issue717-pttales-master
Home: https://github.com/zopefoundation/Zope
Commit: 84020e02a9cd1390e6655e70329e0b3a82320054
https://github.com/zopefoundation/Zope/commit/84020e02a9cd1390e6655e70329e0b3a82320054
Author: Dieter Maurer <d-maurer at users.noreply.github.com>
Date: 2020-03-27 (Fri, 27 Mar 2020)
Changed paths:
M CHANGES.rst
M requirements-full.txt
M setup.py
M src/Products/Five/browser/pagetemplatefile.py
M src/Products/PageTemplates/Expressions.py
M src/Products/PageTemplates/engine.py
M src/Products/PageTemplates/expression.py
A src/Products/PageTemplates/tests/input/InterpolationInContent.html
A src/Products/PageTemplates/tests/output/CH_CheckNotExpression.html
A src/Products/PageTemplates/tests/output/CH_CheckPathAlt.html
M src/Products/PageTemplates/tests/output/CheckNotExpression.html
M src/Products/PageTemplates/tests/output/CheckPathAlt.html
A src/Products/PageTemplates/tests/output/InterpolationInContent.html
M src/Products/PageTemplates/tests/output/Loop2.html
M src/Products/PageTemplates/tests/output/RepeatVariable.html
A src/Products/PageTemplates/tests/testChameleonTalesExpressions.py
M src/Products/PageTemplates/tests/testHTMLTests.py
A src/Products/PageTemplates/tests/testZopeTalesExpressions.py
M src/Products/PageTemplates/tests/test_pagetemplate.py
M src/Products/PageTemplates/tests/test_persistenttemplate.py
M src/Products/PageTemplates/tests/util.py
M versions-prod.cfg
Log Message:
-----------
resolve merge conflicts
More information about the checkins
mailing list