From 3391e190680d3625a166bb6573df26e1bda30af2 Mon Sep 17 00:00:00 2001
From: "John R. Lenton" <jlenton@gmail.com>
Date: Tue, 7 Jan 2014 18:06:34 +0000
Subject: A bit of stylistic cleanup (chose the wrong side during conflict
 resolution).

---
 py/objnone.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'py/objnone.c')

diff --git a/py/objnone.c b/py/objnone.c
index dc93c25e2d..c0efe6c0f5 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -15,8 +15,8 @@ void none_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_ob
 }
 
 const mp_obj_type_t none_type = {
-    .base = { &mp_const_type },
-    .name = "NoneType",
+    { &mp_const_type },
+    "NoneType",
     .print = none_print,
 };
 
-- 
cgit v1.2.3