From 966992abd488c882ee86249196808bfdb1df6429 Mon Sep 17 00:00:00 2001
From: petermcs <petermcs@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Mon, 15 Feb 2010 11:43:16 +0000
Subject: [PATCH] Fixed up unresolved conflict which was breaking compile.

---
 bacnet-stack/demo/object/lo.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bacnet-stack/demo/object/lo.c b/bacnet-stack/demo/object/lo.c
index 926c9a63..a771df74 100644
--- a/bacnet-stack/demo/object/lo.c
+++ b/bacnet-stack/demo/object/lo.c
@@ -40,11 +40,7 @@
 #include "config.h"     /* the custom stuff */
 #include "rp.h"
 #include "wp.h"
-<<<<<<< .mine
-#include "lo.h"
-=======
 #include "handlers.h"
->>>>>>> .r1574
 
 #ifndef MAX_LIGHTING_OUTPUTS
 #define MAX_LIGHTING_OUTPUTS 5