Skip to content

Commit

Permalink
Update Package.swift
Browse files Browse the repository at this point in the history
remove merge conflict label
  • Loading branch information
alanjcharles authored Feb 27, 2024
1 parent a970757 commit 5a8d696
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,8 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
<<<<<<< HEAD
.package(url: "https://github.com/segmentio/sovran-swift.git", from: "1.1.0"),
.package(url: "https://github.com/segmentio/jsonsafeencoder-swift.git", from: "1.0.1")
=======
.package(url: "https://github.com/segmentio/sovran-swift.git", from: "1.1.1"),
.package(url: "https://github.com/segmentio/jsonsafeencoder-swift.git", from: "1.0.0")
>>>>>>> main
.package(url: "https://github.com/segmentio/jsonsafeencoder-swift.git", from: "1.0.1")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down

0 comments on commit 5a8d696

Please sign in to comment.