[commit: ghc] wip/perf-testsuite: Greatly improved printing. Fixed the delta function. Made things simpler (70a05c5)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/perf-testsuite
Link       : http://ghc.haskell.org/trac/ghc/changeset/70a05c51226843c2a73bd57ab477f78474a891dd/ghc

>---------------------------------------------------------------

commit 70a05c51226843c2a73bd57ab477f78474a891dd
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Wed Jul 26 18:30:37 2017 -0700

    Greatly improved printing. Fixed the delta function. Made things simpler
    
    Signed-off-by: Jared Weakly <jweakly at pdx.edu>


>---------------------------------------------------------------

70a05c51226843c2a73bd57ab477f78474a891dd
 testsuite/driver/perf_notes.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/testsuite/driver/perf_notes.py b/testsuite/driver/perf_notes.py
index a3d856f..ffa7656 100644
--- a/testsuite/driver/perf_notes.py
+++ b/testsuite/driver/perf_notes.py
@@ -7,11 +7,6 @@
 # metrics across arbitrary commits. The file will produce a table comparing
 # metrics between measurements taken for given commits in the environment given
 # by --test-env.
-<<<<<<< HEAD
-=======
-
-from __future__ import print_function
->>>>>>> Cleaning up my trash code for the perf_notes comparison tool
 
 # TODO: Actually figure out what imports I need.
 import argparse