CVS commit: pkgsrc/mbone/vic-devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr 26 21:36:31 UTC 2025

Modified Files:
        pkgsrc/mbone/vic-devel: distinfo

Log Message:
vic-devel: fix empty conflicts marker


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mbone/vic-devel/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mbone/vic-devel/distinfo
diff -u pkgsrc/mbone/vic-devel/distinfo:1.11 pkgsrc/mbone/vic-devel/distinfo:1.12
--- pkgsrc/mbone/vic-devel/distinfo:1.11        Sat Apr 26 18:25:14 2025
+++ pkgsrc/mbone/vic-devel/distinfo     Sat Apr 26 21:36:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2025/04/26 18:25:14 he Exp $
+$NetBSD: distinfo,v 1.12 2025/04/26 21:36:31 wiz Exp $
 
 BLAKE2s (vic-2.8ucl1.4.0_ov511.diff.gz) = 6ee05f47167e8496673cc9eb029ac124cc91d78d1d8b9ba49962259dbc23534d
 SHA512 (vic-2.8ucl1.4.0_ov511.diff.gz) = b2618dddb2b07ceec37fb8f11d05c7164bc089f9f720c6d697e2d3b83f086bf2f1efeb99bf79f3b9d164f472fe485b31780d687c9f4fc04a28ba2d22a109dfb5
@@ -6,9 +6,6 @@ Size (vic-2.8ucl1.4.0_ov511.diff.gz) = 8
 BLAKE2s (vic-2.8ucl1.4.0beta-4337.tgz) = f1f9f42edab51c7a9d8858fa1f80157e956cd38450aec4b93c7f1deeb0d0d08c
 SHA512 (vic-2.8ucl1.4.0beta-4337.tgz) = d159ce47447432193d6b537beb6faeb3f2f64ba06223d9726ff813c6f81eff1a6a64bb1fd5a4edcf41b9e069c159e55a680e0edaf668817173b9dfe1fc068fef
 Size (vic-2.8ucl1.4.0beta-4337.tgz) = 9345775 bytes
-<<<<<<< distinfo
-=======
->>>>>>> 1.10
 SHA1 (patch-Makefile.in) = 9f913eee4a9b9bfbf6e5735f04af97cdba92d297
 SHA1 (patch-codec_tmndec_store.c) = 65b7aa01864f428088788b0311a2c88dc7a46914
 SHA1 (patch-color-swscale.cpp) = 0796262c5db74cc354ce7f55ae246c489f5c9b33