Fix failure resolving conflicts

kantacky · Feb 22, 2024 · 25022fd · 25022fd
1 parent b9f3339
commit 25022fd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/YumemiTraining.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/YumemiTraining.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "ios-training",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/yumemi-inc/ios-training.git",
+      "state" : {
+        "branch" : "main",
+        "revision" : "1b3f2bf61fd0dd1b92f4d0254db49784963a82aa"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/YumemiTraining/ForecastView.swift b/YumemiTraining/ForecastView.swift
@@ -30,7 +30,7 @@ struct ForecastView<ViewModel: ForecastViewModel>: View {
                     spacing: .zero
                 )
 
-                TemeratureView(
+                TemperatureView(
                     maxTemperature: viewModel.weather?.maxTemperature,
                     minTemperature: viewModel.weather?.minTemperature
                 )