[commit: ghc] wip/perf-testsuite: Cleaning up my trash code for the perf_notes comparison tool (04fa630)

[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/04fa63072bfdd4124452af67581f47e946263321/ghc

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

commit 04fa63072bfdd4124452af67581f47e946263321
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Sat Jul 22 20:48:48 2017 -0700

    Cleaning up my trash code for the perf_notes comparison tool


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

04fa63072bfdd4124452af67581f47e946263321
 testsuite/driver/perf_notes.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testsuite/driver/perf_notes.py b/testsuite/driver/perf_notes.py
index 060cc7b..4445596 100644
--- a/testsuite/driver/perf_notes.py
+++ b/testsuite/driver/perf_notes.py
@@ -7,6 +7,11 @@
 # 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
 
 import argparse
 import re