Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ayeshLK committed Jul 24, 2023
2 parents c30c734 + c2584f4 commit cf29ac9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ distribution = "2201.6.0"
groupId = "io.ballerina.stdlib"
artifactId = "java.jms-native"
version = "0.1.0"
path = "../native/build/libs/java.jms-native-0.1.0-SNAPSHOT.jar"
path = "../native/build/libs/java.jms-native-0.1.0.jar"

[[platform.java11.dependency]]
groupId = "org.slf4j"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=0.1.0-SNAPSHOT
version=0.1.1-SNAPSHOT
ballerinaLangVersion=2201.6.0

checkstylePluginVersion=8.18
Expand Down

0 comments on commit cf29ac9

Please sign in to comment.