diff options
| author | dragonprevost <dragon@dkp.io> | 2018-11-15 12:41:49 -0800 |
|---|---|---|
| committer | dragonprevost <dragon@dkp.io> | 2018-11-15 12:41:49 -0800 |
| commit | dbe3864176a739d45a89417b71b71ded99656c86 (patch) | |
| tree | e6d1927576ad5e129cab94cd9c5690a3f11fca69 /motionMonitor | |
| parent | 27dec638c20271b1b8aff084385d11e74bad39c8 (diff) | |
| parent | 7ba91139470e24608d255ec0156444e26133d935 (diff) | |
fixed merge conflicts
Diffstat (limited to 'motionMonitor')
| -rw-r--r-- | motionMonitor/Component.cdef | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/motionMonitor/Component.cdef b/motionMonitor/Component.cdef index 9627adf..ea17866 100644 --- a/motionMonitor/Component.cdef +++ b/motionMonitor/Component.cdef @@ -1,7 +1,7 @@ cflags: { -std=c99 - -I$BRNKL_ROOT/apps/util + -I$CURDIR/../util } requires: @@ -23,5 +23,5 @@ provides: sources: { motionMonitor.c - $BRNKL_ROOT/apps/util/util.c + $CURDIR/../util/util.c } |