From 26e6a930a8d109ef86d823eb8ba167dee0e9feb3 Mon Sep 17 00:00:00 2001
From: dawoodkhan82 <dawoodkhan82@gmail.com>
Date: Tue, 23 Jul 2019 14:44:11 -0700
Subject: [PATCH] fix conflict in requires.txt

---
 gradio.egg-info/requires.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gradio.egg-info/requires.txt b/gradio.egg-info/requires.txt
index 42eb37aa6f..9f67db07f8 100644
--- a/gradio.egg-info/requires.txt
+++ b/gradio.egg-info/requires.txt
@@ -6,7 +6,4 @@ psutil
 paramiko
 scipy
 IPython
-<<<<<<< HEAD
 scikit-image
-=======
->>>>>>> master