no message

2020-07-17 00:32:03 +08:00 · 2020-07-17 00:32:03 +08:00 · e0d4cf15ec
parent a24104b5e5
commit e0d4cf15ec
1 changed files with 0 additions and 4 deletions
--- a/App/Views/blog/article.html
+++ b/App/Views/blog/article.html
@ -61,11 +61,7 @@
                            <ul class="nav nav-tabs" style="font-size: 12px;">
                                {% for docid,doc in typedoc.arr %}
                                <li class="active" style="width: 100%; background:#d4ccb0;">
-<<<<<<< HEAD
                                    <a  style="background:#d4ccb0;"  href="https://www.testingcloud.club/wapi/NewUi/article/{{ docid }}/{{ doc.title }}">
-=======
-                                    <a  style="background:#d4ccb0;"  href="{{ url }}/NewUi/article/{{ docid }}/{{ doc.title }}">
->>>>>>> 3b6e1bd64531e310e55605bb5be4d5699e5b6a35
                                        {{doc.title}}
                                    </a></li>
                                {% endfor %}