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

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

(limited to 'py/objtype.c')

diff --git a/py/objtype.c b/py/objtype.c
index 012071d6e..8778c180c 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -23,8 +23,8 @@ static mp_obj_t type_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args)
 }
 
 const mp_obj_type_t mp_const_type = {
-    .base = { &mp_const_type },
-    .name = "type",
+    { &mp_const_type },
+    "type",
     .print = type_print,
     .call_n = type_call_n,
 };
-- 
cgit v1.2.3