Modifications pour FreshRSS-Android @ Framasoft Weblate

Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) error: could not apply e954b2c... Prepare release 1.4.1 Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply e954b2c... Prepare release 1.4.1 Auto-merging CHANGELOG.md CONFLICT (content): Merge conflict in CHANGELOG.md (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) error: could not apply e954b2c... Prepare release 1.4.1 Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply e954b2c... Prepare release 1.4.1 Auto-merging CHANGELOG.md CONFLICT (content): Merge conflict in CHANGELOG.md (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Alerte déclenchée FreshRSS-Android Main	Le lien URL vers le site Web du projet est brisé Il y a un an
Aucun Alerte déclenchée FreshRSS-Android F-droid	Le lien URL vers le site Web du projet est brisé Il y a un an
Aucun Alerte déclenchée FreshRSS-Android F-droid	Le lien URL vers le dépôt est brisé Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an
Aucun Échec du rebasement du dépôt FreshRSS-Android Main	Rebasing (1/4) dropping e954b2c295c9edbd8c5b3d48c07143f7393e7d3d Prepare release 1.4.1 -- patch contents already upstream Rebasing (2/4) error: could not apply b9ce1db... Fix release script Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply b9ce1db... Fix release script Auto-merging Jenkinsfile-release CONFLICT (content): Merge conflict in Jenkinsfile-release (1) Il y a un an

14 / 40

/ 40

Rechercher

Action

Nom d’utilisateur de l’auteur

Change period