File tree Expand file tree Collapse file tree 3 files changed +7
-2
lines changed Expand file tree Collapse file tree 3 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -36,4 +36,4 @@ shadowJar {
3636 archiveBaseName. set(' JShellPlaygroundBackend' )
3737 archiveClassifier. set(' ' )
3838 archiveVersion. set(' ' )
39- }
39+ }
Original file line number Diff line number Diff line change @@ -41,4 +41,4 @@ shadowJar {
4141 archiveBaseName. set(' JShellWrapper' )
4242 archiveClassifier. set(' ' )
4343 archiveVersion. set(' ' )
44- }
44+ }
Original file line number Diff line number Diff line change @@ -65,7 +65,12 @@ subprojects {
6565 }
6666
6767 dependencies {
68+ <<<<<< < HEAD
6869 testImplementation ' org.junit.jupiter:junit-jupiter:5.10.2'
6970 testImplementation ' org.junit.jupiter:junit-jupiter:5.10.2'
71+ ====== =
72+ testImplementation ' org.junit.jupiter:junit-jupiter:5.8.1'
73+ testImplementation ' org.junit.jupiter:junit-jupiter:5.8.1'
74+ >>>>>>> 1a41fc8 (Merge to master (#20 ))
7075 }
7176}
You can’t perform that action at this time.
0 commit comments