Oops, updates from merge

dotnet · Jul 31, 2020 · d152b3f · d152b3f
1 parent 46727c0
commit d152b3f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/docs/core/diagnostics/event-counters.md b/docs/core/diagnostics/event-counters.md
@@ -1,12 +1,7 @@
 ---
 title: EventCounters in .NET Core
-<<<<<<< HEAD
-description: In this article you'll learn what EventCounters are, how to implement them, and how to consume them.
-ms.date: 07/31/2020
-=======
 description: In this article, you'll learn what EventCounters are, how to implement them, and how to consume them.
 ms.date: 07/22/2020
->>>>>>> 5bbc470727df863cdf8c1a0631df27870a96e68b
 ---
 
 # EventCounters in .NET Core