Fix conflicts

hosting/templates/hosting/base_short.html

@@ -130,11 +130,15 @@
     {% if request.user.is_authenticated %}
     <footer class="footer-vm">
         <div class="container">
+<<<<<<< HEAD
             <div class="row">
                 <div class="col-lg-12">
                     <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
                 </div>
             </div>
+=======
+            <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
+>>>>>>> 7b197ec75bb8eecd239988ac929315b50c50d233
         </div>
     </footer>
     {% endif %}

hosting/templates/hosting/reset_password.html

@@ -10,6 +10,16 @@
                 <h2>{% trans "Your VM hosted in Switzerland"%}</h2>
             </div>
             <div class="auth-content">
+
+                {% if messages %}
+                    <ul class="list-unstyled" style="color: #fff">
+                    {% for message in messages %}
+                        <li>{{ message }}</li>
+                    {% endfor %}
+                    </ul>
+                {% endif %}
+
+                
                 <div class="intro-message auth-box sign-up">
                     <h2  class="section-heading">{% trans "Reset your password"%}</h2>
                     <form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate>