|
None
Repository merge failed |
08/01/2018
|
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
None
Repository merge failed |
Removing wiki/src/install/inc/steps/install_final_in_debian.inline.pt.po Removing wiki/src/install/inc/steps/install_final_in_debian.inline.mdwn CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.it.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.it.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.fr.po CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po left in tree. CONFLICT (modify/delete): wiki/src/install/inc/steps/install_final_in_debian.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/install/inc/steps/install_final_in_debian.inline.es.po left in tree. Removing wiki/src/install/inc/steps/install_final_in_debian.inline.de.po Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po Auto-merging wiki/src/install/expert/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.it.po Auto-merging wiki/src/install/expert/usb.fr.po Auto-merging wiki/src/install/expert/usb.fa.po Auto-merging wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/debian/usb.it.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.it.po Auto-merging wiki/src/install/debian/usb.fr.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.fr.po Auto-merging wiki/src/install/debian/usb.fa.po Auto-merging wiki/src/install/debian/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/01/2018 |
|
admin
Changes pushed |
Changes pushed
07/28/2018
|
|
admin
Changes pushed |
Changes pushed
07/28/2018
|
|
None
Changes pushed |
Changes pushed
07/28/2018
|