Fix buggy merge.

debian/changelog

 tails (1.1) unstable; urgency=medium
-<<<<<<< HEAD
-=======
 
   * Dummy entry for next release.
 
  -- Tails developers <tails@boum.org>  Tue, 29 Apr 2014 12:00:00 +0200
 
 tails (1.0) unstable; urgency=medium
->>>>>>> origin/devel
 
   * Security fixes
     - Upgrade the web browser to 24.5.0esr-0+tails1~bpo60+1