Resolve merge conflict markers in 7 files

deploy-to-gh-pages.txt

@@ -1 +1 @@
-3766
+2617

docs/04_glossary/self-authenticating.md

@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 # self authenticating
-=======
-# self authenticating
-=======
->>>>>>> upstream/main
->>>>>>> upstream/main
-## See 
-[self-certifying](self-certifying-identifier)
+## See
+[self-certifying](self-certifying-identifier)

docs/04_glossary/streamer.md

@@ -1,27 +1,10 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 # streamer
 ## Definition
- A convenience class for supporting stream parsing, including nested (tunneled, encrypted) CESR streams. Streams can be a mixture/combination of different primitives, including other streams. A stream is a concatenation of primitives.
-
-=======
->>>>>>> upstream/main
-## Definition
- A convenience class for supporting stream parsing, including nested (tunneled, encrypted) [CESR](CESR) streams. Streams can be a mixture/combination of different [primitives](primitive), including other streams. A stream is a concatenation of primitives.  
+A convenience class for supporting stream parsing, including nested (tunneled, encrypted) [CESR](CESR) streams. Streams can be a mixture/combination of different [primitives](primitive), including other streams. A stream is a concatenation of primitives.
 Source: Kent Bull in chat Zoom meeting KERI Aug 6, 2024.
 
 ## More
-<<<<<<< HEAD
-=======
-# streamer
-## Definition
- A convenience class for supporting stream parsing, including nested (tunneled, encrypted) CESR streams. Streams can be a mixture/combination of different primitives, including other streams. A stream is a concatenation of primitives.
-
-=======
->>>>>>> upstream/main
->>>>>>> upstream/main
-It is akin to a cryptographic primitive yet is not a cryptographic primitive itself. 
+It is akin to a cryptographic primitive yet is not a cryptographic primitive itself.
 
-It supports [ESSR](ESSR) by making it easier to handle tunneled streams.  
-Source: Kent Bull in chat Zoom meeting KERI Aug 6, 2024.
+It supports [ESSR](ESSR) by making it easier to handle tunneled streams.
+Source: Kent Bull in chat Zoom meeting KERI Aug 6, 2024.

docs/08_annotated-copies/WebOfTrust-ietf-acdc-main-draft-ssmith-acdc.md

@@ -4,19 +4,11 @@
 <div className="accordion-item" data-level="1">
 
 
-<<<<<<< HEAD
-<h2 className="accordion-header" id="header1425503260945">
-
-
-<button className="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#accordeon-1425503260945" aria-expanded="false" aria-controls="accordeon-1425503260945">
-                            1425503260945, level 1
-=======
 <h2 className="accordion-header" id="header4171595971390">
 
 
 <button className="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#accordeon-4171595971390" aria-expanded="false" aria-controls="accordeon-4171595971390">
                             4171595971390, level 1
->>>>>>> upstream/main
 
 
 </button>
@@ -25,11 +17,7 @@
 </h2>
 
 
-<<<<<<< HEAD
-<div id="accordeon-1425503260945" className="accordion-collapse collapse">
-=======
 <div id="accordeon-4171595971390" className="accordion-collapse collapse">
->>>>>>> upstream/main
 
 
 <div className="accordion-body">

docs/08_annotated-copies/WebOfTrust-ietf-cesr-proof-main-draft-pfeairheller-cesr-proof.md

@@ -4,19 +4,11 @@
 <div className="accordion-item" data-level="1">
 
 
-<<<<<<< HEAD
-<h2 className="accordion-header" id="header7672366676663">
-
-
-<button className="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#accordeon-7672366676663" aria-expanded="false" aria-controls="accordeon-7672366676663">
-                            7672366676663, level 1
-=======
 <h2 className="accordion-header" id="header9286652585568">
 
 
 <button className="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#accordeon-9286652585568" aria-expanded="false" aria-controls="accordeon-9286652585568">
                             9286652585568, level 1
->>>>>>> upstream/main
 
 
 </button>
@@ -25,11 +17,7 @@
 </h2>
 
 
-<<<<<<< HEAD
-<div id="accordeon-7672366676663" className="accordion-collapse collapse">
-=======
 <div id="accordeon-9286652585568" className="accordion-collapse collapse">
->>>>>>> upstream/main
 
 
 <div className="accordion-body">

docs/08_annotated-copies/WebOfTrust-ietf-ipex-main-draft-ssmith-ipex.md

@@ -4,19 +4,11 @@
 <div className="accordion-item" data-level="1">
 
 
-<<<<<<< HEAD
-<h2 className="accordion-header" id="header1810592926574">
-
-
-<button className="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#accordeon-1810592926574" aria-expanded="false" aria-controls="accordeon-1810592926574">
-                            1810592926574, level 1
-=======
 <h2 className="accordion-header" id="header8203357166114">
 
 
 <button className="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#accordeon-8203357166114" aria-expanded="false" aria-controls="accordeon-8203357166114">
                             8203357166114, level 1
->>>>>>> upstream/main
 
 
 </button>
@@ -25,11 +17,7 @@
 </h2>
 
 
-<<<<<<< HEAD
-<div id="accordeon-1810592926574" className="accordion-collapse collapse">
-=======
 <div id="accordeon-8203357166114" className="accordion-collapse collapse">
->>>>>>> upstream/main
 
 
 <div className="accordion-body">