Solved merge conflicts
This commit is contained in:
commit
9a7e2ea96d
0
include/mm.hpp → include/mm.h
Executable file → Normal file
0
include/mm.hpp → include/mm.h
Executable file → Normal file
|
|
@ -1,7 +1,7 @@
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include "esp32-hal-gpio.h"
|
#include "esp32-hal-gpio.h"
|
||||||
#include "mm.hpp" /* Archivos header ubicados en include/ */
|
|
||||||
#include <api.h>
|
#include <api.h>
|
||||||
|
#include "mm.h" /* Archivos header ubicados en include/ */
|
||||||
|
|
||||||
void m1handler();
|
void m1handler();
|
||||||
void m2handler();
|
void m2handler();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user