Fix merge error

cmcgee1024 · cmcgee1024 · commit 34948bd663a2 · 2025-03-13T11:07:39.000-04:00
diff --git a/Sources/Swiftly/Init.swift b/Sources/Swiftly/Init.swift
@@ -42,18 +42,11 @@ internal struct Init: SwiftlyCommand {
         if var config, !overwrite &&
             (
                 config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0, suffix: "dev") ||
-<<<<<<< HEAD
-                    config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0)
-            )
-        {
-            // This is a simple upgrade from the 0.4.0-dev pre-release, or 0.4.0 release
-=======
                     config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0) ||
                     (config.version?.major == 1 && config.version?.minor == 0)
             )
         {
             // This is a simple upgrade from the 0.4.0 pre-releases, or 1.x
->>>>>>> 726ea90b9c304068d9649abc8718f8752169ce7b
 
             // Move our executable over to the correct place
             try Swiftly.currentPlatform.installSwiftlyBin()

Original file line number	Diff line number	Diff line change
`@@ -42,18 +42,11 @@ internal struct Init: SwiftlyCommand {`
`42`	`42`	`if var config, !overwrite &&`
`43`	`43`	`(`
`44`	`44`	`config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0, suffix: "dev") \|\|`
`45`		`-<<<<<<< HEAD`
`46`		`- config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0)`
`47`		`- )`
`48`		`- {`
`49`		`- // This is a simple upgrade from the 0.4.0-dev pre-release, or 0.4.0 release`
`50`		`-=======`
`51`	`45`	`config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0) \|\|`
`52`	`46`	`(config.version?.major == 1 && config.version?.minor == 0)`
`53`	`47`	`)`
`54`	`48`	`{`
`55`	`49`	`// This is a simple upgrade from the 0.4.0 pre-releases, or 1.x`
`56`		`->>>>>>> 726ea90b9c304068d9649abc8718f8752169ce7b`
`57`	`50`
`58`	`51`	`// Move our executable over to the correct place`
`59`	`52`	`try Swiftly.currentPlatform.installSwiftlyBin()`