fixing merge conflicts

xuezhou25 · xuezhou25 · commit 702cb9c93fbe · 2022-11-03T20:30:43.000-07:00
Signed-off-by: Xue Zhou &lt;xuezhou@amazon.com&gt;
diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java
@@ -602,11 +602,7 @@ public static void generateFailureXContent(XContentBuilder builder, Params param
                 }
                 t = t.getCause();
             }
-<<<<<<< HEAD
             builder.field(ERROR, ExceptionsHelper.summaryMessage(e));
-=======
-            builder.field(ERROR, ExceptionsHelper.summaryMessage(t != null ? t : e));
->>>>>>> b0a62b73dd65c2f5636f78568daf785af21ed902
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -602,11 +602,7 @@ public static void generateFailureXContent(XContentBuilder builder, Params param`
`602`	`602`	`}`
`603`	`603`	`t = t.getCause();`
`604`	`604`	`}`
`605`		`-<<<<<<< HEAD`
`606`	`605`	`builder.field(ERROR, ExceptionsHelper.summaryMessage(e));`
`607`		`-=======`
`608`		`- builder.field(ERROR, ExceptionsHelper.summaryMessage(t != null ? t : e));`
`609`		`->>>>>>> b0a62b73dd65c2f5636f78568daf785af21ed902`
`610`	`606`	`return;`
`611`	`607`	`}`
`612`	`608`