gistfile1.sh

igor@igorlaptop:~/dev/battletweets$ git pull
remote: Counting objects: 14, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (8/8), done.
From git@gitorious.org:battletwitts/mainline
   4edec1b..e2cdde7  master     -> origin/master
Removed media/img/twittniclog.png
Auto-merged templates/results.html
Merge made by recursive.
 media/img/logo.png        |  Bin 0 -> 3462 bytes
 media/img/twittniclog.png |  Bin 115444 -> 0 bytes
 templates/base.html       |   20 ++++++++++----------
 templates/results.html    |    9 +++++----
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 media/img/logo.png
 delete mode 100644 media/img/twittniclog.png