rebase over master

Signed-off-by: Birgit Brecknell <b@brck.nl>
seL4 · Aug 25, 2024 · 6cbb8b4 · 6cbb8b4
1 parent c2d6907
commit 6cbb8b4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/Foundation/Summit/2024/index.html b/Foundation/Summit/2024/index.html
@@ -26,7 +26,13 @@ <h4>
     <li><a href="#summit-program">Program & Abstracts</a></li>
     <li><a href="#summit-keynote-speakers">Keynote Speakers</a></li>
     <!-- li><a href="#summit-panellists">Panellists</a></li>-->
+<<<<<<< HEAD
     <li><a class="highlight" href="#summit-training-day">Latest news: Training day @ UNSW</a></li>
+=======
+    <li><a class="highlight" href="#summit-program">Latest news: Program & Abstracts</a></li>
+    <!--li><a href="#summit-keynote-speakers">Keynote Speakers</a></li>
+    <li><a href="#summit-panellists">Panellists</a></li-->
+>>>>>>> 88fc5d9 (resolve merge conflicts)
     <li><a href="#summit-pc">Program Committee</a></li>
     <li><a href="#summit-sponsors">Sponsors</a></li>
     <li><a href="#summit-contact">Contact</a></li>
@@ -111,6 +117,24 @@ <h3 id="summit-location">
   </p>
 </div>
 
+<<<<<<< HEAD
+=======
+
+<div class="summit_div">
+  <h3 id="summit-program">
+    Program & Abstracts
+  </h3>
+  <p>
+    Check out the summit <a href="program">Program</a> and <a href="abstracts2024">Abstracts</a> for our list of speakers and presentations.
+  </p>
+  <p>
+  <p>
+    See the <a href="https://events.linuxfoundation.org/sel4-summit/program/schedule/">Schedule</a> on LF Events.
+  </p>
+</div>
+
+
+>>>>>>> 88fc5d9 (resolve merge conflicts)
 <div class="summit_div">
   <h3 id="summit-cfp">
     Submissions and Call for Presentations
@@ -173,6 +197,7 @@ <h3 id="summit-keynote-speakers">
 </div>
 
 
+<<<<<<< HEAD
 <div class="summit_div">
   <h3 id="summit-training-day">
     Training day @ UNSW
@@ -244,6 +269,8 @@ <h4>Using Rust in seL4 Userspace</h4>
 </div>
 
 
+=======
+>>>>>>> 88fc5d9 (resolve merge conflicts)
 <div class="summit_div">
   <h3 id="summit-pc">
     Program Committee

diff --git a/_includes/abstracts/2024/cheri-morello.html b/_includes/abstracts/2024/cheri-morello.html
@@ -4,7 +4,11 @@
     SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 <h4 class="summit-abstract-title">
+<<<<<<< HEAD
     Enhancing seL4’s C/C++ userspace memory safety using CHERI
+=======
+    seL4 CHERI/Morello port
+>>>>>>> 88fc5d9 (resolve merge conflicts)
 </h4>
 <p class="summit-abstract-type">
     Talk