From 58f3a9f162c49714040cb945e40c7f6e187fee7e Mon Sep 17 00:00:00 2001
From: Craig Long <craig.long@autodesk.com>
Date: Mon, 13 Nov 2023 16:06:44 -0500
Subject: [PATCH] Update bad merge conflict fix and update test

---
 src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx          | 2 ++
 .../MarkdownGeneratorCommandTests.cs                            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx b/src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx
index 1b90a2e0c23..29c8053b1a5 100644
--- a/src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx
+++ b/src/Libraries/CoreNodeModels/CoreNodeModelsImages.resx
@@ -1423,6 +1423,8 @@
         o5EQb3EPxDvhBSSK9yvLGYs4K03xNndAsAteVtKIwyVIX8xkdVwu4U03zFudgxDFU5Cg+CIM8jI9omum
         CzjKRkebedkZCFFchQTFF+BXXAdfvAmED/E5r0alVj7sDIT88BQSFJ+HVfG6gVgLfIAFOAcDvOQdiNK/
         oO9P4g0aeIfP9wFYbEj5mAMhlQAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="CoreNodeModels.Logic.Gate.Large" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
diff --git a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs
index ac07d1cee09..aa591f752ae 100644
--- a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs
+++ b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs
@@ -164,7 +164,7 @@ public void ProducesCorrectOutputFromCoreDirectory_preloadedbinaries()
             FromDirectoryCommand.HandleDocumentationFromDirectory(opts);
 
             var generatedFileNames = tempDirectory.GetFiles().Select(x => x.Name);
-            Assert.AreEqual(684, generatedFileNames.Count());
+            Assert.AreEqual(685, generatedFileNames.Count());
         }
 
         [Test]