minor

wtf
bsumlin · Oct 23, 2017 · d5bf43b · d5bf43b
1 parent df81ec6
commit d5bf43b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -24,8 +24,4 @@ Or clone from source and run
 
   * [Sumlin B.J., Heinson W.R., and Chakrabarty R.K. (2017) Retrieving the Aerosol Complex Refractive Index using PyMieScatt: A Mie Computational Package with Visualization Capabilities. Journal of Quantitative Spectroscopy and Radiative Transfer](https://doi.org/10.1016/j.jqsrt.2017.10.012)
 
-<<<<<<< HEAD
   * [Sumlin B.J., Pandey A., Walker M.J., Pattison R.S., Williams B.J., and Chakrabarty R.K. (2017) Atmospheric Photooxidation Diminishes Light Absorption by Primary Brown Carbon Aerosol from Biomass Burning, Environmental Science & Technology Letters](https://doi.org/10.1021/acs.estlett.7b00393)
-=======
-  * [Benjamin J. Sumlin, Apoorva Pandey, Michael J. Walker, Robert S. Pattison, Brent J. Williams, and Rajan K. Chakrabarty (2017) Atmospheric Photooxidation Diminishes Light Absorption by Primary Brown Carbon Aerosol from Biomass Burning, Environmental Science & Technology Letters](https://doi.org/10.1021/acs.estlett.7b00393)
->>>>>>> 814f621d6a0e83813bed72d60bc27e70aff887a1