Component Translated Words
Android App
91.4%
91.4%
Craue Config
85.8%
83.1%
Messages
75.1%
69.1%
User
98.5%
99.4%
Validators
85.3%
85.5%
- Good translations
- Translations with failing checks
- Fuzzy translations
Project website https://www.wallabag.org/
Number of strings 10047
Number of words 53253
Number of languages 18
Number of source strings 715
Number of source words 3785
Language Translated Words
Aragonese
0.0%
0.0%
Basque
100.0%
100.0%
Danish
34.0%
16.6%
English
100.0%
100.0%
French
100.0%
100.0%
German
100.0%
100.0%
Hungarian
84.3%
77.4%
Italian
81.0%
71.5%
Japanese
100.0%
100.0%
Norwegian Bokmål (nb_NO)
6.5%
6.0%
Occitan
98.9%
99.2%
Persian
59.3%
41.0%
Polish
100.0%
100.0%
Portuguese
83.1%
79.8%
Romanian
34.0%
16.7%
Russian
100.0%
100.0%
Spanish
100.0%
100.0%
Turkish
85.7%
78.2%

There are currently no glossaries defined for this project.

Manage all glossaries
When User Action Translation
yesterday None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Removing build.xml
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Removing build.xml
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
3 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
3 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
4 days ago None Failed merge on repository wallabag/Messages
Removing web/bundles/wallabagcore/themes/material/js/material.min.js
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.woff
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/fonts/MaterialIcons-Regular.eot
Removing web/bundles/wallabagcore/themes/material/fonts/IcoMoon-Free.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-ThinItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Thin.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-RegularItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Regular.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-MediumItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-LightItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BoldItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-BlackItalic.eot
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff2
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.woff
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.ttf
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Removing web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.eot
Removing web/bundles/wallabagcore/themes/material/css/style.min.css
Removing web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
Removing web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Removing web/bundles/wallabagcore/themes/baggy/css/style.min.css
Removing web/bundles/wallabagcore/themes/_global/img
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
Auto-merging src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
Auto-merging src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
CONFLICT (content): Merge conflict in src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Removing docs/it/user/upgrade.rst
Removing docs/it/user/parameters.rst
Removing docs/it/user/installation.rst
Removing docs/it/user/import.rst
Removing docs/it/user/filters.rst
Removing docs/it/user/faq.rst
Removing docs/it/user/errors_during_fetching.rst
Removing docs/it/user/create_account.rst
Removing docs/it/user/configuring_mobile.rst
Removing docs/it/user/configuration.rst
Removing docs/it/user/backup.rst
Removing docs/it/user/articles.rst
Removing docs/it/user/android.rst
Removing docs/it/requirements.txt
Removing docs/it/index.rst
Removing docs/it/developer/translate.rst
Removing docs/it/developer/testsuite.rst
Removing docs/it/developer/paywall.rst
Removing docs/it/developer/documentation.rst
Removing docs/it/developer/docker.rst
Removing docs/it/developer/asynchronous.rst
Removing docs/it/developer/api.rst
Removing docs/it/conf.py
Removing docs/img/wallabag.png
Removing docs/img/user/topbar.png
Removing docs/img/user/share.png
Removing docs/img/user/sent_email.png
Removing docs/img/user/registration_form.png
Removing docs/img/user/refetch.png
Removing docs/img/user/login_form.png
Removing docs/img/user/import_wllbg.png
Removing docs/img/user/import_wallabagv1.png
Removing docs/img/user/filters.png
Removing docs/img/user/export_wllbg_2.png
Removing docs/img/user/export_wllbg_1.png
Removing docs/img/user/export_v2.png
Removing docs/img/user/export_v1.png
Removing docs/img/user/download_articles.png
Removing docs/img/user/download_article.png
Removing docs/img/user/annotations_3.png
Removing docs/img/user/annotations_2.png
Removing docs/img/user/annotations_1.png
Removing docs/img/user/android_welcome_screen.en.png
Removing docs/img/user/android_welcome_screen.de.png
Removing docs/img/user/android_unread_feed_synced.en.png
Removing docs/img/user/android_unread_feed_synced.de.png
Removing docs/img/user/android_configuration_scroll_bottom.en.png
Removing docs/img/user/android_configuration_scroll_bottom.de.png
Removing docs/img/user/android_configuration_screen.en.png
Removing docs/img/user/android_configuration_screen.de.png
Removing docs/img/user/android_configuration_saved_feed_update.en.png
Removing docs/img/user/android_configuration_saved_feed_update.de.png
Removing docs/img/user/android_configuration_get_feed_credentials.en.png
Removing docs/img/user/android_configuration_get_feed_credentials.de.png
Removing docs/img/user/android_configuration_filled_in.en.png
Removing docs/img/user/android_configuration_filled_in.de.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
Removing docs/img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
Removing docs/img/user/android_configuration_connection_test_success.en.png
Removing docs/img/user/android_configuration_connection_test_success.de.png
Removing docs/img/user/android_configuration_connection_test.en.png
Removing docs/img/user/android_configuration_connection_test.de.png
Removing docs/img/user/activated_account.png
Removing docs/img/user/2FA_form.png
Removing docs/fr/user/upgrade.rst
Removing docs/fr/user/tags.rst
Removing docs/fr/user/query-upgrade-21-22.rst
Removing docs/fr/user/parameters.rst
Removing docs/fr/user/installation.rst
Removing docs/fr/user/import.rst
Removing docs/fr/user/filters.rst
Removing docs/fr/user/faq.rst
Removing docs/fr/user/errors_during_fetching.rst
Removing docs/fr/user/create_account.rst
Removing docs/fr/user/configuring_mobile.rst
Removing docs/fr/user/configuration.rst
Removing docs/fr/user/backup.rst
Removing docs/fr/user/articles.rst
Removing docs/fr/user/android.rst
Removing docs/fr/requirements.txt
Removing docs/fr/index.rst
Removing docs/fr/developer/translate.rst
Removing docs/fr/developer/testsuite.rst
Removing docs/fr/developer/paywall.rst
Removing docs/fr/developer/documentation.rst
Removing docs/fr/developer/docker.rst
Removing docs/fr/developer/asynchronous.rst
Removing docs/fr/developer/api.rst
Removing docs/fr/conf.py
Removing docs/en/user/upgrade.rst
Removing docs/en/user/tags.rst
Removing docs/en/user/query-upgrade-21-22.rst
Removing docs/en/user/parameters.rst
Removing docs/en/user/installation.rst
Removing docs/en/user/import.rst
Removing docs/en/user/filters.rst
Removing docs/en/user/faq.rst
Removing docs/en/user/errors_during_fetching.rst
Removing docs/en/user/create_account.rst
Removing docs/en/user/configuring_mobile.rst
Removing docs/en/user/configuration.rst
Removing docs/en/user/backup.rst
Removing docs/en/user/articles.rst
Removing docs/en/user/android.rst
Removing docs/en/requirements.txt
Removing docs/en/index.rst
Removing docs/en/developer/translate.rst
Removing docs/en/developer/testsuite.rst
Removing docs/en/developer/paywall.rst
Removing docs/en/developer/documentation.rst
Removing docs/en/developer/docker.rst
Removing docs/en/developer/asynchronous.rst
Removing docs/en/developer/api.rst
Removing docs/en/conf.py
Removing docs/de/user/upgrade.rst
Removing docs/de/user/tags.rst
Removing docs/de/user/query-upgrade-21-22.rst
Removing docs/de/user/parameters.rst
Removing docs/de/user/installation.rst
Removing docs/de/user/import.rst
Removing docs/de/user/filters.rst
Removing docs/de/user/faq.rst
Removing docs/de/user/errors_during_fetching.rst
Removing docs/de/user/create_account.rst
Removing docs/de/user/configuring_mobile.rst
Removing docs/de/user/configuration.rst
Removing docs/de/user/backup.rst
Removing docs/de/user/articles.rst
Removing docs/de/user/android.rst
Removing docs/de/requirements.txt
Removing docs/de/index.rst
Removing docs/de/developer/translate.rst
Removing docs/de/developer/testsuite.rst
Removing docs/de/developer/paywall.rst
Removing docs/de/developer/documentation.rst
Removing docs/de/developer/docker.rst
Removing docs/de/developer/asynchronous.rst
Removing docs/de/developer/api.rst
Removing docs/de/conf.py
Auto-merging app/Resources/static/themes/material/index.js
Auto-merging app/Resources/static/themes/material/css/print.scss
Removing app/Resources/static/themes/material/css/main.css
Auto-merging app/Resources/static/themes/baggy/index.js
Removing app/Resources/static/themes/baggy/font/icomoon.woff
Removing app/Resources/static/themes/baggy/font/icomoon.ttf
Removing app/Resources/static/themes/baggy/font/icomoon.svg
Removing app/Resources/static/themes/baggy/font/icomoon.eot
Auto-merging app/Resources/static/themes/baggy/css/print.scss
Removing app/Resources/static/themes/baggy/css/messages.css
Removing app/Resources/static/themes/baggy/css/font.css
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
Auto-merging app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
CONFLICT (content): Merge conflict in app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
Removing Gruntfile.js
Automatic merge failed; fix conflicts and then commit the result. (1)
6 days ago Allan Nordhøy Translation completed wallabag/Craue Config - Norwegian Bokmål (nb_NO)
Browse all project changes

Activity in last 30 days

Activity in last year