From d58a984878ea290e04a135ef037b75e13b7b8df5 Mon Sep 17 00:00:00 2001
From: zwwhdls <zwwhdls@hotmail.com>
Date: Wed, 1 Jul 2020 21:29:20 +0800
Subject: [PATCH] fix conflict

Signed-off-by: zwwhdls <zwwhdls@hotmail.com>
---
 pkg/strvals/parser.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkg/strvals/parser.go b/pkg/strvals/parser.go
index 45aa65eac..457b99f94 100644
--- a/pkg/strvals/parser.go
+++ b/pkg/strvals/parser.go
@@ -314,16 +314,11 @@ func (t *parser) listItem(list []interface{}, i int) ([]interface{}, error) {
 			}
 		}
 		// Now we need to get the value after the ].
-<<<<<<< HEAD
-		list2, err := t.listItem(crtList, i)
+		list2, err := t.listItem(crtList, nextI)
 		if err != nil {
 			return list, err
 		}
 		return setIndex(list, i, list2)
-=======
-		list2, err := t.listItem(crtList, nextI)
-		return setIndex(list, i, list2), err
->>>>>>> fix another extreme case
 	case last == '.':
 		// We have a nested object. Send to t.key
 		inner := map[string]interface{}{}