<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
  <head>
    <title th:text="#{view.error.general.title}">Error page</title>

    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

    <link rel="stylesheet" href="../../../../../../target/webapp/css/style.css" th:href="@{/css/style.css}"/>
  </head>
  <body>
<<<<<<< HEAD
    <div th:replace="fragment/layout :: topbar"></div>
    <div class="row">
      <div class="large-12 columns">
        <h1 th:text="#{view.error.general.title}">Error page</h1>

        <p th:text="${errorMessage}">The error message</p>

        <ul>
          <li th:each="stackElement : ${stackTrace}">
            <pre th:text="${stackElement}"></pre>
          </li>
        </ul>
      </div>
    </div>

    <script src="../../../js-vendor/jquery.js" th:src="@{/js-vendor/jquery.js}"></script>
    <script src="../../../js-vendor/foundation.js" th:src="@{/js-vendor/foundation.js}"></script>
    <script src="../../../js-vendor/foundation.topbar.js" th:src="@{/js-vendor/foundation.topbar.js}"></script>
    <script>$(document).foundation();</script>
  </body>
</html>

<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
  <head>
    <title th:text="#{view.error.general.title}">Error page</title>

    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

    <link rel="stylesheet" href="../../../../../../target/webapp/css/style.css" th:href="@{/css/style.css}"/>
  </head>
  <body>
    <div th:replace="fragment/layout :: topbar"></div>
    <div class="row">
      <div class="large-12 columns">
        <h1 th:text="#{view.error.general.title}">Error page</h1>

        <p th:text="${errorMessage}">The error message</p>

        <ul>
          <li th:each="stackElement : ${stackTrace}">
            <pre th:text="${stackElement}"></pre>
          </li>
        </ul>
      </div>
    </div>

    <script src="../../../js-vendor/jquery.js" th:src="@{/js-vendor/jquery.js}"></script>
    <script src="../../../js-vendor/foundation.js" th:src="@{/js-vendor/foundation.js}"></script>
    <script src="../../../js-vendor/foundation.topbar.js" th:src="@{/js-vendor/foundation.topbar.js}"></script>
    <script>$(document).foundation();</script>
  </body>
</html>

Remove line that was created in a merge conflict
Remove line that was created in a merge conflict
