test-mergeconflict-rule

openshift · Apr 22, 2024 · ebf8fbc · ebf8fbc
1 parent 0977beb
commit ebf8fbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/_templates/_page_openshift.html.erb b/_templates/_page_openshift.html.erb
@@ -546,7 +546,7 @@
         adjustMain();
       }
     });
-
+-
     window.addEventListener('resize', () => {
       if ($(window).width() >= 1008) {
         adjustSide();

diff --git a/modules/about-crio.adoc b/modules/about-crio.adoc
@@ -9,3 +9,9 @@
 include::snippets/about-crio-snippet.adoc[]
 
 When container runtime issues occur, verify the status of the `crio` systemd service on each node. Gather CRI-O journald unit logs from nodes that have container runtime issues.
+
+<<<<<<<
+
+=======
+
+>>>>>>>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,9 @@ @@
     include::snippets/about-crio-snippet.adoc[]
     When container runtime issues occur, verify the status of the `crio` systemd service on each node. Gather CRI-O journald unit logs from nodes that have container runtime issues.
+    <<<<<<<
+    =======
+    >>>>>>>