Quentin Guidée ab8f731515 Fixed some conflicts

2020-02-12 17:42:58 +01:00

..

moduledefs.h

[python] Generated moduledefs.h file

2019-08-21 11:13:13 +02:00

mpversion.h

[python] Upgrade to micropython 1.11

2019-08-21 10:58:12 +02:00

qstrdefs.in.h

Fixed some conflicts

2020-02-12 17:42:58 +01:00