Skip to content

Commit

Permalink
#720 and #722 conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rM-self-serve committed Dec 8, 2023
1 parent 0df8256 commit b4c21bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package/signature-rm/package
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ section="utils"
maintainer="rM-self-serve <[email protected]>"
license=MIT
image=rust:v3.1
conflicts=(ddvk-hacks)
conflicts=(ddvk-hacks webinterface-onboot)

source=(
"$url"/archive/b5561af4eb6a0f5aa6e98e1a1279066f0c4bd9b7.zip
Expand Down
2 changes: 1 addition & 1 deletion package/webinterface-onboot/package
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ timestamp=2023-12-03T11:43:00Z
section="utils"
maintainer="rM-self-serve <[email protected]>"
license=MIT
conflicts=(ddvk-hacks)
conflicts=(ddvk-hacks signature-rm)

source=(
"$url"/archive/cdfe457435974f7ca309b1ac50f1b2ef67000813.zip
Expand Down

0 comments on commit b4c21bb

Please sign in to comment.