fuzz

Signed-off-by: Adrian Cole <[email protected]>
openzipkin · Jan 11, 2024 · c9d85b8 · c9d85b8
1 parent e9cf90d
commit c9d85b8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/_data/community_tracers_instrumentation.yml b/_data/community_tracers_instrumentation.yml
@@ -328,7 +328,6 @@
   sampling: "Yes"
   notes: A Zipkin integration for Symfony applications
 
-<<<<<<< HEAD
 - language: PHP
   library: >-
     [zipkin-instrumentation-doctrine](https://github.com/jcchavezs/zipkin-instrumentation-doctrine)