[vistrails] 18/19: fix commit

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository vistrails.

commit 7b5483e7001422ede6b2073ac18bf956a8832611
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 18 10:54:49 2016 +0000

    fix commit
---
 debian/control | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/debian/control b/debian/control
index 2a3d4ea..80d5625 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,8 @@ Package: vistrails
 Section: science
 Architecture: all 
 Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-qt4, python-matplotlib, 
-<<<<<<< HEAD
   python-suds, python-sip, jupyter-qtconsole, python-sklearn,
   python-vtk6, python-qt4-gl, python-qt4-sql, python-usagestats
-=======
-  python-suds, python-sip, python-sklearn, jupyter-qtconsole,
-  python-vtk6, python-qt4-gl, python-qt4-sql
->>>>>>> debian/2.2-branch
 Description: Science visualisation workflow toolkit
  VisTrails is an open-source scientific workflow and provenance management
  system developed at the University of Utah that provides support for 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vistrails.git