Resolve a conflict (#9421)

Author: michaelklishin

deps/rabbit_common/src/rabbit_numerical.erl

@@ -30,11 +30,7 @@
 %%       human-readable output, or compact ASCII serializations for floats.
 digits(N) when is_integer(N) ->
     integer_to_list(N);
-<<<<<<< HEAD
-digits(0.0) ->
-=======
 digits(N) when N =:= +0.0 orelse N =:= -0.0 ->
->>>>>>> 5a2ef73595 (Negative zero fix)
     "0.0";
 digits(Float) ->
     {Frac1, Exp1} = frexp_int(Float),