dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed up unresolved conflict which was breaking compile.

Browse Source
This commit is contained in:
petermcs
2010-02-15 11:43:16 +00:00
parent ecb1f2064f
commit 966992abd4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/object/lo.c
-4
View File
@@ -40,11 +40,7 @@
#include "config.h" /* the custom stuff */ #include "config.h" /* the custom stuff */
#include "rp.h" #include "rp.h"
#include "wp.h" #include "wp.h"
<<<<<<< .mine
#include "lo.h"
=======
#include "handlers.h" #include "handlers.h"
>>>>>>> .r1574
#ifndef MAX_LIGHTING_OUTPUTS #ifndef MAX_LIGHTING_OUTPUTS
#define MAX_LIGHTING_OUTPUTS 5 #define MAX_LIGHTING_OUTPUTS 5