junk commit to be squashed later

JuliaLang · Aug 24, 2015 · 4c9a26d · 4c9a26d
2 parents c1fea5b + 0aa3ec8
commit 4c9a26d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/test/rounding.jl b/test/rounding.jl
@@ -110,6 +110,7 @@ end
 for T in [Float32,Float64]
     for v in [sqrt(big(2.0)),-big(1.0)/big(3.0),nextfloat(big(1.0)),
               prevfloat(big(1.0)),nextfloat(big(0.0)),prevfloat(big(0.0)),
+<<<<<<< HEAD
               pi,e,eulergamma,golden,
               typemax(Int64),typemax(UInt64),typemax(Int128),typemax(UInt128),0xa2f30f6001bb2ec6]
         pn = T(v,RoundNearest)