skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed broken merge

This commit is contained in:
Skyler Lehmkuhl 2013-01-13 14:19:00 -05:00
parent 6fa8648b0d
commit 77934cc4ae
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control
View File

@ -4,10 +4,6 @@ Section: graphics
Priority: optional Priority: optional
Architecture: all Architecture: all
Installed-size: 27000 Installed-size: 27000
<<<<<<< HEAD Depends: bash, python, python-imaging, libc
Depends: bash, python, libc
=======
Depends: bash, python, python-imaging
>>>>>>> 783687aeb3bb92c515f31f44b919bb0102d64d2f
Maintainer: skycooler@gmail.com Maintainer: skycooler@gmail.com
Description: Lightningbeam is an open-source animated content creation tool. Description: Lightningbeam is an open-source animated content creation tool.