diff options
author | Damien George <damien.p.george@gmail.com> | 2014-01-07 15:58:30 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-01-07 15:58:30 +0000 |
commit | 97209d38e17a0f3cb2a2d3f03d726fd322b4808f (patch) | |
tree | 514cc35179713b4128ec6218829d769d87d7fe70 /py/objnone.c | |
parent | d49420e74c721bb6c61925a6c9a2addbaeed3382 (diff) | |
parent | a5a01df81d01705b9f04264cc46fbb1bc32641b3 (diff) |
Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
py/objcomplex.c
Diffstat (limited to 'py/objnone.c')
-rw-r--r-- | py/objnone.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/py/objnone.c b/py/objnone.c index 877e61fe5..c0efe6c0f 100644 --- a/py/objnone.c +++ b/py/objnone.c @@ -18,7 +18,6 @@ const mp_obj_type_t none_type = { { &mp_const_type }, "NoneType", .print = none_print, - .methods = {{NULL, NULL},}, }; static const mp_obj_none_t none_obj = {{&none_type}}; |