Docker build (#7134)

DennisOSRM · web-flow · commit a056d6e5b3b1 · 2025-03-20T19:40:56.000+01:00
diff --git a/third_party/libosmium/appveyor.yml b/third_party/libosmium/appveyor.yml
diff --git a/third_party/libosmium/include/osmium/io/pbf.hpp b/third_party/libosmium/include/osmium/io/pbf.hpp
@@ -5,11 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-<<<<<<<< HEAD:third_party/libosmium/include/osmium/index/bool_vector.hpp
-Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
-========
 Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
->>>>>>>> 89b30b26e52b729191b9ed10d1c4ef08933d92ef:third_party/libosmium/include/osmium/io/pbf.hpp
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
diff --git a/third_party/libosmium/include/osmium/tags/taglist.hpp b/third_party/libosmium/include/osmium/tags/taglist.hpp
@@ -5,7 +5,7 @@
 
 This file is part of Osmium (https://osmcode.org/libosmium).
 
-Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
+Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
