From d73f0c7b8fea3fa5220e23b71971b2c8748f8571 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 26 Jan 2020 21:01:22 +0100
Subject: [PATCH] - fixed the merge

---
 source/blood/src/aiunicult.cpp | 3 ++-
 source/blood/src/aiunicult.h   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/blood/src/aiunicult.cpp b/source/blood/src/aiunicult.cpp
index 757f4b684..47294fa31 100644
--- a/source/blood/src/aiunicult.cpp
+++ b/source/blood/src/aiunicult.cpp
@@ -1995,4 +1995,5 @@ bool genDudePrepare(spritetype* pSprite, int propId) {
     return true;
 }
 
-#endifEND_BLD_NS
+#endif
+END_BLD_NS
diff --git a/source/blood/src/aiunicult.h b/source/blood/src/aiunicult.h
index 784c0e92b..4e91c2412 100644
--- a/source/blood/src/aiunicult.h
+++ b/source/blood/src/aiunicult.h
@@ -221,4 +221,5 @@ bool genDudePrepare(spritetype* pSprite, int propId = kGenDudePropertyAll);
 void genDudeUpdate(spritetype* pSprite);
 void genDudeProcess(spritetype* pSprite, XSPRITE* pXSprite);
 bool genDudeAdjustSlope(spritetype* pSprite, XSPRITE* pXSprite, int dist, int weaponType, int by = 64);
-#endifEND_BLD_NS
+#endif
+END_BLD_NS