Skip to content

Commit 11286f0

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template'
2 parents 68fe9cc + 4d4b380 commit 11286f0

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
4+
# Force sh files to have LF
5+
*.sh text eol=lf
6+
7+
# Force MVN Wrapper Linux files LF
8+
mvnw text eol=lf
9+
.mvn/wrapper/maven-wrapper.properties text eol=lf

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ A Vaadin Template Repo
1313
## Installation
1414
[Installation guide for the latest release](https://github.com/xdev-software/template-placeholder/releases/latest#Installation)
1515

16-
1716
## Run the Demo
1817
* Checkout the repo
1918
* Run ``mvn install && mvn -f template-placeholder-demo spring-boot:run``
2019
* Open http://localhost:8080
2120

22-
2321
<details>
2422
<summary>Show example</summary>
2523

template-placeholder-demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<dependency>
190190
<groupId>com.puppycrawl.tools</groupId>
191191
<artifactId>checkstyle</artifactId>
192-
<version>10.15.0</version>
192+
<version>10.16.0</version>
193193
</dependency>
194194
</dependencies>
195195
<configuration>

template-placeholder/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
<dependency>
299299
<groupId>com.puppycrawl.tools</groupId>
300300
<artifactId>checkstyle</artifactId>
301-
<version>10.15.0</version>
301+
<version>10.16.0</version>
302302
</dependency>
303303
</dependencies>
304304
<configuration>

0 commit comments

Comments
 (0)