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/objdict.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'py/objdict.c')

diff --git a/py/objdict.c b/py/objdict.c
index f226abbd2f..66a442fbaa 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -61,8 +61,8 @@ static mp_obj_t dict_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
 }
 
 const mp_obj_type_t dict_type = {
-    .base = { &mp_const_type },
-    .name = "dict",
+    { &mp_const_type },
+    "dict",
     .print = dict_print,
     .make_new = dict_make_new,
     .binary_op = dict_binary_op,
-- 
cgit v1.2.3