summaryrefslogtreecommitdiff
path: root/rust-bin/.signature
diff options
context:
space:
mode:
authorDanny Rawlins <monster.romster@gmail.com>2019-05-18 22:55:07 +1000
committerDanny Rawlins <monster.romster@gmail.com>2019-05-18 22:55:07 +1000
commit6ef5f9490431681500ad56241fbc696f075eaf27 (patch)
tree95cba356d936efcd83ab78cebd817f3c4869e895 /rust-bin/.signature
parentaf9ee34c7af4fe6b629cb87ef47cfd9585e30537 (diff)
parentc99a8bf7d9228ba38997f5bbe37fe50e9fe04e43 (diff)
downloadopt-6ef5f9490431681500ad56241fbc696f075eaf27.tar.gz
opt-6ef5f9490431681500ad56241fbc696f075eaf27.tar.xz
Merge branch '3.4' into 3.5
Diffstat (limited to 'rust-bin/.signature')
-rw-r--r--rust-bin/.signature7
1 files changed, 7 insertions, 0 deletions
diff --git a/rust-bin/.signature b/rust-bin/.signature
index ae92ba91b..ddeee4b47 100644
--- a/rust-bin/.signature
+++ b/rust-bin/.signature
@@ -1,5 +1,12 @@
untrusted comment: verify with /etc/ports/opt.pub
+<<<<<<< HEAD
RWSE3ohX2g5d/R3JnLwtGuQbauZ3zSyXfvc0nkvyUB0SpSlKAQDyylMU9nIiMCHlalnnfox5Y9G4YS/vclQ6bPVOAnL4Mich9AI=
SHA256 (Pkgfile) = ff950b4abe73c53df647a818e189eeda8615ffa59b0c880183f90cd686a47736
SHA256 (.footprint) = cb42e7134ebceebac2da72a136dbb64ee2acdff6dd7754de9d2141317b32b4f6
SHA256 (rust-1.34.1-crux-3.5-bin.tar.xz) = 382c30acccf7b9ff3a7f993c6aa71439b97ff67c6992481bcff37e717d021af4
+=======
+RWSE3ohX2g5d/Q92XYzct06ucVwNxzIcCA+2onH86Lyqs1IJfvcEZlshuCUOjQed498iqw3QWcUymMIGFory7k3v/41DXExg+Qw=
+SHA256 (Pkgfile) = 8bc3ad84a16a06b6aabced12a62070ad24b5aed6b92f558893c40f15a1e95e2b
+SHA256 (.footprint) = cfac0dba92335a83b07e48a766abcecc53bc6cf7a5f604f63970a6a3790f8a95
+SHA256 (rust-1.34.2-bin.tar.xz) = ea837f8308a7661f43e92a35b6900d182ff617cf80daf25744fcf661df853d11
+>>>>>>> c99a8bf7d9228ba38997f5bbe37fe50e9fe04e43

Generated by cgit