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 {
36
36
archiveBaseName. set(' JShellPlaygroundBackend' )
37
37
archiveClassifier. set(' ' )
38
38
archiveVersion. set(' ' )
39
- }
39
+ }
Original file line number Diff line number Diff line change @@ -41,4 +41,4 @@ shadowJar {
41
41
archiveBaseName. set(' JShellWrapper' )
42
42
archiveClassifier. set(' ' )
43
43
archiveVersion. set(' ' )
44
- }
44
+ }
Original file line number Diff line number Diff line change @@ -64,7 +64,12 @@ subprojects {
64
64
}
65
65
66
66
dependencies {
67
+ <<<<<< < HEAD
67
68
testImplementation ' org.junit.jupiter:junit-jupiter:5.10.2'
68
69
testImplementation ' org.junit.jupiter:junit-jupiter:5.10.2'
70
+ ====== =
71
+ testImplementation ' org.junit.jupiter:junit-jupiter:5.8.1'
72
+ testImplementation ' org.junit.jupiter:junit-jupiter:5.8.1'
73
+ >>>>>>> 1a41fc8 (Merge to master (#20 ))
69
74
}
70
75
}
You can’t perform that action at this time.
0 commit comments