solved conflicts

angelmerino · Mar 23, 2017 · fbbe91b · fbbe91b
2 parents 3f38d35 + caaa3e6
commit fbbe91b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/ugui.h b/ugui.h
@@ -17,7 +17,6 @@
 #ifndef __UGUI_H
 #define __UGUI_H
 
-//#include "system.h"
 #include "ugui_config.h"