Rebasing/merge whitespaces missing

utmapp · Feb 27, 2024 · 13fbdd9 · 13fbdd9
1 parent 0e6d3fd
commit 13fbdd9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -407,4 +407,4 @@ jobs:
           xcrun altool --upload-app -t macos -f "UTM.pkg" -u "$SUBMIT_USERNAME" -p "$SUBMIT_PASSWORD"
         env:
           SUBMIT_USERNAME: ${{ secrets.SIGNING_USERNAME }}
-          SUBMIT_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SUBMIT_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
diff --git a/Platform/visionOS/VMToolbarOrnamentModifier.swift b/Platform/visionOS/VMToolbarOrnamentModifier.swift
@@ -154,4 +154,4 @@ private struct ToolbarOrnamentViewModifier: ViewModifier {
             .padding(12)
             .glassBackgroundEffect()
     }
-}
+}
diff --git a/patches/sources b/patches/sources
@@ -46,4 +46,4 @@ VIRGLRENDERER_COMMIT="dc039d9ecd74fc671a85bfbe7c4e4bc552b7b855"
 
 # Decompiled Hypervisor for iOS
 HYPERVISOR_REPO="https://github.com/utmapp/Hypervisor.git"
-HYPERVISOR_COMMIT="bcec1a8b0cb3b07ecd0f81b33f26fa3048ffd307"
+HYPERVISOR_COMMIT="bcec1a8b0cb3b07ecd0f81b33f26fa3048ffd307"
-Original file line number
+Diff line change
@@ Expand Up / @@ -154,4 +154,4 @@ private struct ToolbarOrnamentViewModifier: ViewModifier { @@
                 .padding(12)
                 .glassBackgroundEffect()
         }
-    }
+    }