[Debian-id-commits] [debian-id/debian-ebook] f50f42: Fix file that have conflict with latest commit

[Mahyuddin Susanto]

  Branch: refs/heads/master
  Home:   https://github.com/debian-id/debian-ebook
  Commit: f50f42a3b50373326bb219ce3817124286e43ebb
      https://github.com/debian-id/debian-ebook/commit/f50f42a3b50373326bb219ce3817124286e43ebb
  Author: Mahyuddin Susanto <udienz at gmail.com>
  Date:   2012-12-27 (Thu, 27 Dec 2012)

  Changed paths:
    M conf.py
    M index.rst
    M src/sistem-boot/lilo.rst

  Log Message:
  -----------
  Fix file that have conflict with latest commit

Signed-off-by: Mahyuddin Susanto <udienz at gmail.com>