From 8b58e6fe28af85ec8b4e7eadb485f6f1c4ea0e53 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Wed, 14 Jun 2023 01:32:43 +0100
Subject: [PATCH] fix merge conflicts

---
 isle.mak |  19 +++++++++++++++++++
 isle.mdp | Bin 51200 -> 51200 bytes
 2 files changed, 19 insertions(+)

diff --git a/isle.mak b/isle.mak
index e70c28f9..2913bc72 100644
--- a/isle.mak
+++ b/isle.mak
@@ -55,6 +55,7 @@ ALL : ".\Release\LEGO1.DLL"
 
 CLEAN : 
 	-@erase "$(INTDIR)\dllmain.obj"
+	-@erase "$(INTDIR)\legonavcontroller.obj"
 	-@erase "$(INTDIR)\legoomni.obj"
 	-@erase "$(INTDIR)\mxautolocker.obj"
 	-@erase "$(INTDIR)\mxcore.obj"
@@ -125,6 +126,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  /out:"Release/LEGO1.DLL" /implib:"Release/LEGO1.LIB" 
 LINK32_OBJS= \
 	"$(INTDIR)\dllmain.obj" \
+	"$(INTDIR)\legonavcontroller.obj" \
 	"$(INTDIR)\legoomni.obj" \
 	"$(INTDIR)\mxautolocker.obj" \
 	"$(INTDIR)\mxcore.obj" \
@@ -162,6 +164,7 @@ ALL : ".\Debug\LEGO1.DLL"
 
 CLEAN : 
 	-@erase "$(INTDIR)\dllmain.obj"
+	-@erase "$(INTDIR)\legonavcontroller.obj"
 	-@erase "$(INTDIR)\legoomni.obj"
 	-@erase "$(INTDIR)\mxautolocker.obj"
 	-@erase "$(INTDIR)\mxcore.obj"
@@ -236,6 +239,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  /out:"Debug/LEGO1.DLL" /implib:"$(OUTDIR)/LEGO1.lib" 
 LINK32_OBJS= \
 	"$(INTDIR)\dllmain.obj" \
+	"$(INTDIR)\legonavcontroller.obj" \
 	"$(INTDIR)\legoomni.obj" \
 	"$(INTDIR)\mxautolocker.obj" \
 	"$(INTDIR)\mxcore.obj" \
@@ -678,6 +682,21 @@ DEP_CPP_MXOMNICR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\legonavcontroller.cpp
+DEP_CPP_LEGON=\
+	".\LEGO1\legonavcontroller.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	
+
+"$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 # End Source File
 # End Target
 ################################################################################
diff --git a/isle.mdp b/isle.mdp
index 9a7cd26268c5f59b226e5a22a0f60f508c91d743..1855de7a87900545fb1a465f01ced5ce017dc802 100644
GIT binary patch
delta 260
zcmZpez}zr_c>{;k=7f?TjGJUQgdhw97{dj|h?v1Qd1-;}q!<?7yu`BP{JfH){G6QB
zqRo@irt?5$#871Pk_!qL85tN@ChL_*Oy(&O-5gnbh@C??CpA4EsBp4<z1n2GMz+aJ
z6I3?4R=;FLk=d-*xP)=?f+kLWsB)N%lk*#;HeYIzP}#JCLx>|izbHRbFT-xKVur!y
V+}N9}o3G}FFca+@d8S3jm;f_GV4eT~

delta 107
zcmZpez}zr_c>{;kW(BSvjGJUQgdhw97{dj|h?v2*`A*tIp3NJJKe10vn9ep?Vxr3C
u-_<W!L7dGJP4gHxzi5_F*{C4KxM>B4&}8{c<IVM1?>K-Ot}`t<#smO-v?_`K