Skip to content

Commit 6ca274a

Browse files
committed
Auto stash before merge of "master" and "origin/master"
1 parent 12f145f commit 6ca274a

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@
2323
hs_err_pid*
2424
/target/
2525

26-
src/main/java/info/unterrainer/commons/jreutils/Information.java
26+
src/main/java/info/unterrainer/commons/websocketclient/Information.java
2727

2828
.settings/
2929

3030
.classpath
3131

32+
/bin/
33+
3234
bin/
3335

36+
.vscode/
37+
3438
dependency-reduced-pom.xml

src/main/java/info/unterrainer/commons/websocketclient/Information.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)