merge request to debian-id

[udienz]

pak kok ada tulisan gini yah

"This pull request cannot be automatically merged." ? gini aja pak, langsung di pull ke main repo aja. bapak bisa pull ke main repo debian-id kok

[nurulhuda]

saya coba dulu ya..

[udienz]

Sip udah bisa merge, btw ada file yang konflik deh pak.

Conflicts:
    conf.py
    index.rst
    src/sistem-boot/lilo.rst