[taler-taler-merchant-demos] 08/18: fix merge issue

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-merchant-demos.

commit 06c708def001b20b6e15d02c5224d835559e4f71
Merge: d6459ab 3b378dd
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 6 18:48:48 2020 +0200

    fix merge issue

 Makefile                                     |  26 ++++++-
 README.md                                    |  23 +++++-
 talermerchantdemos/.vscode/launch.json       |  15 ++++
 talermerchantdemos/blog/templates/base.html  |  63 ++++++++++++----
 talermerchantdemos/blog/templates/index.html |   2 +-
 talermerchantdemos/static/__init__.py        |   1 +
 talermerchantdemos/static/demo.css           |  27 +++++--
 talermerchantdemos/static/navbar.css         |  75 +++++++++++++++++++
 talermerchantdemos/static/navbar.css.map     |   1 +
 talermerchantdemos/static/navbar.scss        | 103 +++++++++++++++++++++++++++
 10 files changed, 313 insertions(+), 23 deletions(-)

diff --cc talermerchantdemos/blog/templates/index.html
index 0702bf7,89ac3b8..e139bd2
--- a/talermerchantdemos/blog/templates/index.html
+++ b/talermerchantdemos/blog/templates/index.html
@@@ -31,8 -30,8 +31,8 @@@
      <div>
        {% for article in articles %}
        <div class="notice">
-       <h3><a href="{{ url_for('article', lang=article.lang, 
article_name=article.slug) }}">{{article.title}}</a></h3>
 -      <h3><a href="{{ url_for('article', article_name=article.slug) }}" 
class="articleTitle">{{article.title}}</a></h3>
 -      <p>{{ article.teaser|safe }} <a href="{{ url_for('article', 
article_name=article.slug) }}">(Pay to read more...)</a></p>
++      <h3><a href="{{ url_for('article', lang=article.lang, 
article_name=article.slug) }}" class="articleTitle">{{article.title}}</a></h3>
 +      <p>{{ article.teaser|safe }} <a href="{{ url_for('article', 
lang=article.lang, article_name=article.slug) }}">(Pay to read more...)</a></p>
        </div>
        {% else %}
        <em>(No articles available)</em>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.