remove perf tests. They dont use the actual utils so there is no reas…

…on to keep them in this state
kevinhughes27 · Jun 3, 2017 · f9e2e37 · f9e2e37
1 parent f420c91
commit f9e2e37
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 164 deletions.
diff --git a/play.py b/play.py
@@ -1,18 +1,8 @@
 #!/usr/bin/env python
 
 from utils import resize_image, XboxController
-<<<<<<< 48ae7d1910c02bfc04433f31ac9fd14322f7747e
-from termcolor import cprint
-||||||| merged common ancestors
-import tensorflow as tf
-import model
-from termcolor import cprint
-=======
 from termcolor import cprint
 
-import tensorflow as tf
-import model
->>>>>>> split Sample class out of Screenshot class
 import gym
 import gym_mupen64plus
 from train import create_model

diff --git a/tests/perfTests.py b/tests/perfTests.py