old_contents: """
  Molly Project
  http://mollyproject.org
  A framework for creating Mobile Web applications for HE/FE institutions.
  """
  
  <<<<<<< HEAD
  __version__ = '1.3dev'
  =======
  __version__ = '1.2.2'
  >>>>>>> master
  
new_contents: """
  Molly Project
  http://mollyproject.org
  A framework for creating Mobile Web applications for HE/FE institutions.
  """
  
  __version__ = '1.3dev'
  
subject: Fix bad merge