Igor Kulikov 2fb9b74bae Fix conflicts

2024-02-12 14:30:38 +02:00

..

src/main/java/org/thingsboard/server

Fix conflicts

2024-02-12 14:30:38 +02:00

pom.xml

Update license header to 2024 year.

2024-01-09 10:46:16 +02:00