From 9e470d76ab30a51f30aa82abfa421833f859b2cc Mon Sep 17 00:00:00 2001
From: chenguoping <chenguopingdota@163.com>
Date: Sat, 9 Nov 2019 11:25:31 +0800
Subject: [PATCH] fix conflict

---
 src/test_lib_json/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index 9a7df5568..f32a11fbf 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -2258,6 +2258,7 @@ JSONTEST_FIXTURE_LOCAL(StyledStreamWriterTest, multiLineArray) {
                                 "\n\t18,"
                                 "\n\t19,"
                                 "\n\t20\n]\n");
+    Json::StyledStreamWriter writer;
     Json::Value root;
     for (int i = 0; i < 21; i++)
       root[i] = i;