<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p style="color: #777777;">
<a href="https://gitlab.rtems.org/sebhub">Sebastian Huber</a>
started a new
<a href="https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474">discussion</a>:
</p>
<div class="md" style="position: relative; z-index: 1; color: #28272d; word-wrap: break-word;">
<p dir="auto" style="color: #28272d; margin: 0 0 16px;" align="initial">There are some merge markers left, for example:</p>
<div class="gl-relative markdown-code-block js-markdown-code" style="margin-bottom: 0;">
<pre data-canonical-lang="diff" class="code highlight js-syntax-highlight language-diff" v-pre="true" style='display: block; font-size: 14px; color: #28272d; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: "GitLab Mono","JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: .25rem; white-space: pre; margin-top: 0; font-family: "GitLab Mono","JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="diff" style="margin-top: 0;"><span class="gh" style="margin-top: 0;">diff --git a/freebsd/crypto/openssl/engines/e_afalg.c b/freebsd/crypto/openssl/engines/e_afalg.c</span></span>
<span id="LC2" class="line" lang="diff"><span class="gh" style="margin-top: 0;">index f8f655d07..cdd475683 100644</span></span>
<span id="LC3" class="line" lang="diff"><span class="gd" style="margin-top: 0;">--- a/freebsd/crypto/openssl/engines/e_afalg.c</span></span>
<span id="LC4" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ b/freebsd/crypto/openssl/engines/e_afalg.c</span></span>
<span id="LC5" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -1,7 +1,11 @@</span></span>
<span id="LC6" class="line" lang="diff"> #include <machine/rtems-bsd-user-space.h></span>
<span id="LC7" class="line" lang="diff"> </span>
<span id="LC8" class="line" lang="diff"> /*</span>
<span id="LC9" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+<<<<<<< /opt/work/aaron/rtems/libbsd/rtems-libbsd/freebsd/crypto/openssl/engines/e_afalg.c</span></span>
<span id="LC10" class="line" lang="diff"> * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.</span>
<span id="LC11" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+=======</span></span>
<span id="LC12" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.</span></span>
<span id="LC13" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+>>>>>>> /home/aaron/freebsd/crypto/openssl/engines/e_afalg.c</span></span>
<span id="LC14" class="line" lang="diff"> *</span>
<span id="LC15" class="line" lang="diff"> * Licensed under the OpenSSL license (the "License"). You may not use</span>
<span id="LC16" class="line" lang="diff"> * this file except in compliance with the License. You can obtain a copy</span></code></pre>
<copy-code></copy-code><insert-code-snippet></insert-code-snippet>
</div>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.rtems.org">gitlab.rtems.org</a>. <a href="https://gitlab.rtems.org/-/sent_notifications/9e227bc2494d580d6d387fd13f900b75/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.rtems.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.rtems.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Merge request","url":"https://gitlab.rtems.org/rtems/pkg/rtems-libbsd/-/merge_requests/17#note_114474"}}</script>
</p>
</div>
</body>
</html>