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

(limited to 'py/objstr.c')

diff --git a/py/objstr.c b/py/objstr.c
index b95aafe432..cc9f7f85b4 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -191,8 +191,8 @@ static const mp_method_t str_type_methods[] = {
 };
 
 const mp_obj_type_t str_type = {
-    .base = { &mp_const_type },
-    .name = "str",
+    { &mp_const_type },
+    "str",
     .print = str_print,
     .binary_op = str_binary_op,
     .getiter = str_getiter,
@@ -234,8 +234,8 @@ mp_obj_t str_it_iternext(mp_obj_t self_in) {
 }
 
 static const mp_obj_type_t str_it_type = {
-    .base = { &mp_const_type },
-    .name = "str_iterator",
+    { &mp_const_type },
+    "str_iterator",
     .iternext = str_it_iternext,
 };
 
-- 
cgit v1.2.3