Update packet_source.py

tardis-sn · Jan 25, 2023 · 01c4f3c · 01c4f3c
1 parent 9bb9349
commit 01c4f3c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/tardis/montecarlo/packet_source.py b/tardis/montecarlo/packet_source.py
@@ -57,7 +57,6 @@ def create_blackbody_packet_nus(
         temperature, no_of_packets, rng, l_samples=1000
     ):
         """
-<<<<<<< HEAD
         Create packet :math:`\\nu` distributed using the algorithm described in
         Bjorkman & Wood 2001 (page 4) which references
         Carter & Cashwell 1975: