From 77934cc4aefa015fa32be83bebfe9cbcafe9a27f Mon Sep 17 00:00:00 2001
From: Skyler Lehmkuhl <skycooler@gmail.com>
Date: Sun, 13 Jan 2013 14:19:00 -0500
Subject: [PATCH] fixed broken merge

---
 control | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/control b/control
index 01749fd..fc0abc7 100644
--- a/control
+++ b/control
@@ -4,10 +4,6 @@ Section: graphics
 Priority: optional
 Architecture: all
 Installed-size: 27000
-<<<<<<< HEAD
-Depends: bash, python, libc
-=======
-Depends: bash, python, python-imaging
->>>>>>> 783687aeb3bb92c515f31f44b919bb0102d64d2f
+Depends: bash, python, python-imaging, libc
 Maintainer: skycooler@gmail.com
 Description: Lightningbeam is an open-source animated content creation tool.