[LNT] r210136 - Fix my merge fail fail

[Chris Matthews]

Author: cmatthews
Date: Tue Jun  3 18:12:27 2014
New Revision: 210136

URL: http://llvm.org/viewvc/llvm-project?rev=210136&view=rev
Log:
Fix my merge fail fail

Modified:
    lnt/trunk/lnt/util/stats.py

Modified: lnt/trunk/lnt/util/stats.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/stats.py?rev=210136&r1=210135&r2=210136&view=diff
==============================================================================
--- lnt/trunk/lnt/util/stats.py (original)
+++ lnt/trunk/lnt/util/stats.py Tue Jun  3 18:12:27 2014
@@ -10,10 +10,6 @@ def safe_min(l):
     else:
         return min(l)
 
-<<<<<<< HEAD
-=======
-
->>>>>>> Fixups in geomean calculation
 def mean(l):
     if l:
         return sum(l)/len(l)