Ignore:
Timestamp:
03/10/23 21:43:30 (16 months ago)
Author:
SazdovaEkaterina <sazdovaekaterina@…>
Branches:
main
Children:
104185f
Parents:
b46d1f2 (diff), c3278ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

resolve merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Prototype Application/Paw5/src/main/resources/templates/aboutUs.html

    rb46d1f2 r0078d84  
    11<!DOCTYPE html>
    2 <html lang="en">
     2<html lang="en" xmlns:th="http://thymeleaf.org">
    33<head>
    44    <meta charset="UTF-8">
    … …  
    4646    <h5 class="text-center text-danger" th:if="${session.user != null}">
    4747        You successfully logged in
    48         <th:block  th:text="${session.user.getId()}"></th:block>
     48        <th:block  th:text="${session.user?.getId()}"></th:block>
    4949    </h5>
    5050</div>
Note: See TracChangeset for help on using the changeset viewer.