Solved merge conflicts

This commit is contained in:
Fernando 2024-08-15 12:08:44 -06:00
commit 9a7e2ea96d
2 changed files with 1 additions and 1 deletions

0
include/mm.hpp → include/mm.h Executable file → Normal file
View File

View File

@ -1,7 +1,7 @@
#include <Arduino.h>
#include "esp32-hal-gpio.h"
#include "mm.hpp" /* Archivos header ubicados en include/ */
#include <api.h>
#include "mm.h" /* Archivos header ubicados en include/ */
void m1handler();
void m2handler();