Sebastian Huber started a new discussion: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474 There are some merge markers left, for example: ```diff diff --git a/freebsd/crypto/openssl/engines/e_afalg.c b/freebsd/crypto/openssl/engines/e_afalg.c index f8f655d07..cdd475683 100644 --- a/freebsd/crypto/openssl/engines/e_afalg.c +++ b/freebsd/crypto/openssl/engines/e_afalg.c @@ -1,7 +1,11 @@ #include <machine/rtems-bsd-user-space.h> /* +<<<<<<< /opt/work/aaron/rtems/libbsd/rtems-libbsd/freebsd/crypto/openssl/engines/e_afalg.c * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. +======= + * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. +>>>>>>> /home/aaron/freebsd/crypto/openssl/engines/e_afalg.c * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy ``` -- View it on GitLab: https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list [email protected] http://lists.rtems.org/mailman/listinfo/bugs
