Broken push to the installation-guide repository

[Cyril Brulebois]

Hi,

The last commit in the installation-guide repository seems quite broken
as that's a merge (using a rebase instead could have helped detect the
issue) that introduces conflict markers in the repository:

    kibi@armor:~/debian-installer/installation-guide$ git grep -E 
'^(=======|<<<<<<<|>>>>>>>)( |$)' 
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff
    po/el/administrivia.po:<<<<<<< HEAD
    po/el/administrivia.po:=======
    po/el/administrivia.po:>>>>>>> b6b2c92725cbab11b8853070163abd9e8a13f6ff

Can someone please fix that, possibly by reverting this commit entirely,
going back to what we had in the 20190622 tag?


The offending commit is:

    commit 4bb6d14fa00159bad75ef88bbcf6a84560722ab0
    Merge: dfc2cc210 b6b2c9272
    Author: root <galaxico@quteity>
    Date:   Wed Jun 26 14:55:31 2019 +0300
    
        updated Greek translations



Cheers,
-- 
Cyril Brulebois (k...@debian.org)            <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant

signature.asc
Description: PGP signature