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

(limited to 'py/objint.c')

diff --git a/py/objint.c b/py/objint.c
index cf51b7870..9cd5ebae2 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -31,8 +31,8 @@ static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args)
 }
 
 const mp_obj_type_t int_type = {
-    .base = { &mp_const_type },
-    .name = "int",
+    { &mp_const_type },
+    "int",
     .make_new = int_make_new,
 };
 
-- 
cgit v1.2.3