Update bad merge conflict fix and update test

saintentropy · Nov 13, 2023 · 58f3a9f · 58f3a9f
1 parent 0a1abb4
commit 58f3a9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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]