File tree 3 files changed +7
-2
lines changed
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 @@ -65,7 +65,12 @@ subprojects {
65
65
}
66
66
67
67
dependencies {
68
+ <<<<<< < HEAD
68
69
testImplementation ' org.junit.jupiter:junit-jupiter:5.10.2'
69
70
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 ))
70
75
}
71
76
}
You can’t perform that action at this time.
0 commit comments