Preparing release v1.13.0 (jaegertracing#699)

* Preparing release v1.13.0 Signed-off-by: albertteoh <[email protected]> * Increase test coverage on SpanBarRow.tsx Signed-off-by: albertteoh <[email protected]> * Revert "Increase test coverage on SpanBarRow.tsx" This reverts commit 8a9592e. Signed-off-by: albertteoh <[email protected]> Signed-off-by: vvvprabhakar <[email protected]>
vvvprabhakar · Jul 4, 2021 · b0ce29f · b0ce29f
1 parent 40e0d5f
commit b0ce29f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 ### Fixes
 
+<<<<<<< HEAD
 ## v1.14.0 (June 4, 2021)
 
 ### Enhancements
@@ -17,6 +18,8 @@
 - Add null check for span.logs in search/filter-spans ([@achesin](https://github.com/achesin) in [#734](https://github.com/jaegertracing/jaeger-ui/pull/734))
 - Several updates to dependencies.
 
+=======
+>>>>>>> Preparing release v1.13.0 (#699)
 ## v1.13.0 (February 20, 2021)
 
 ### Enhancements