fix: Rebase conflicts

tirumerla · tirumerla · commit b14de9b482d3 · 2025-07-28T21:04:09.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -41,20 +41,10 @@ node_modules
 
 # Ignore local signer keystore files everywhere
 **/local-signer.json
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-openapi.json
-
-**/config/keys/*.json
-=======
->>>>>>> 4f2ddca (fix: Workaround for openapi documentation)
-=======
 **/config/keys/*.json
 
 # Ignore generated OpenAPI files
 openapi.json
 
 # Exclude generated OpenAPI files from the docs directory
 !docs/openapi.json
->>>>>>> 64a7e72 (fix: Switch redocly build with standalone html)
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
@@ -1,16 +1,12 @@
 * xref:index.adoc[User Documentation]
 * xref:quickstart.adoc[Quickstart]
-<<<<<<< HEAD
 * xref:configuration.adoc[Configuration]
 ** xref:signers.adoc[Signers]
 ** xref:network_configuration.adoc[Network Configuration]
 * xref:evm.adoc[EVM Integration]
 * xref:solana.adoc[Solana Integration]
 * xref:stellar.adoc[Stellar Integration]
 * link:https://release-v1-0-0%2D%2Dopenzeppelin-relayer.netlify.app/api_docs.html[API Reference^]
-=======
-* link:https://685119642bfc9e00089daf52%2D%2Dopenzeppelin-relayer.netlify.app/api_docs.html[API Reference^]
->>>>>>> 4f2ddca (fix: Workaround for openapi documentation)
 * xref:structure.adoc[Project Structure]
 * xref:roadmap.adoc[Project Roadmap]
 * xref:plugins.adoc[Plugins]
diff --git a/scripts/rust_antora.sh b/scripts/rust_antora.sh
@@ -39,21 +39,6 @@ else
 fi
 
 # Copy the API docs file to the target directory
-<<<<<<< HEAD
-if [ -f "$API_DOCS_FILE" ]; then
-  # Inject nonce to the script tag in the API docs file
-  echo "Injecting nonce into the script tag in '$API_DOCS_FILE'..."
-  sed -i -e "s/<script>/<script nonce=\"TngzuFQT7LvVFJMfvb8cxW0zN8XF79n6L9OphJOxH8\">/g" "$API_DOCS_FILE"
-  echo "Nonce injected successfully."
-  echo "Copying '$API_DOCS_FILE' to '$BUILD_DIR'..."
-  cp "$API_DOCS_FILE" "$BUILD_DIR/"
-  echo "API docs successfully copied to '$BUILD_DIR'."
-  # Remove the original API docs file
-  echo "Removing original API docs file '$API_DOCS_FILE'..."
-  rm -f "${API_DOCS_FILE}" "${API_DOCS_FILE}-e"
-  echo "Original API docs file '$API_DOCS_FILE' removed."
-fi
-=======
 cat > "$BUILD_DIR/api_docs.html" <<EOF
 <!DOCTYPE html>
 <html lang="en">
@@ -70,9 +55,4 @@ cat > "$BUILD_DIR/api_docs.html" <<EOF
 </html>
 EOF
 
-<<<<<<< HEAD
-echo "✅ Generated api_docs.html → spec-url=${SPEC_URL}"
->>>>>>> 4f2ddca (fix: Workaround for openapi documentation)
-=======
 echo "✅ Generated api_docs.html in '$BUILD_DIR'."
->>>>>>> d55b57c (fix: Script to properly log the output)
