Skip to content

Commit

Permalink
Pushing merge, resolved using upstream.\n\n message=Add privacyinfo r…
Browse files Browse the repository at this point in the history
…esource to Package.swift

Diffs=
922fd80b7 Add privacyinfo resource to Package.swift (#7271)

Co-authored-by: Philip Chung <philterdesign@gmail.com> diff=\n\ndiff --cc .github/workflows/Package.swift.template
index c47eec6,dc4fe14..0000000
--- a/.github/workflows/Package.swift.template
+++ b/.github/workflows/Package.swift.template
@@@ -15,7 -15,7 +15,11 @@@ let package = Package
              checksum: "$CHECKSUM"
          ),
          .target(
++<<<<<<< ours
 +            name: "RiveRuntime",
++=======
+             name: "RiveRuntime-Resources",
++>>>>>>> theirs
              path: "Resources",
              resources: [.copy("PrivacyInfo.xcprivacy")]
          )
  • Loading branch information
philter authored and philter committed May 15, 2024
1 parent 5b53eb4 commit 77e8b3d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Package.swift.template
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ let package = Package(
checksum: "$CHECKSUM"
),
.target(
name: "RiveRuntime",
name: "RiveRuntime-Resources",
path: "Resources",
resources: [.copy("PrivacyInfo.xcprivacy")]
)
]
)
)
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c84d57141c25261c525f537a854afe8c1ac1d6b8
922fd80b78838a83e526f05095aa97ad13468953

0 comments on commit 77e8b3d

Please sign in to comment.