Conflict solved between ext-profile and ext-update

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 9a3d288f49d8c9a8d331f67f6c25227006fc0ca5..c9e2f7ed6dc8b02fd79a04eb8c5b576ad689d259 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -166,6 +166,7 @@ inc/extensions/ext-theme.php -text
 inc/extensions/ext-top10.php -text
 inc/extensions/ext-transfer.php -text
 inc/extensions/ext-uberwach.php -text
+inc/extensions/ext-update.php -text
 inc/extensions/ext-usage.php -text
 inc/extensions/ext-user.php -text
 inc/extensions/ext-wernis.php -text
@@ -1297,6 +1298,7 @@ templates/de/html/ext/ext_theme.tpl -text
 templates/de/html/ext/ext_top10.tpl -text
 templates/de/html/ext/ext_transfer.tpl -text
 templates/de/html/ext/ext_uberwach.tpl -text
+templates/de/html/ext/ext_update.tpl -text
 templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
@@ -1469,6 +1471,7 @@ templates/de/html/member/member_pool_table.tpl -text
 templates/de/html/member/member_primera_mode_list.tpl -text
 templates/de/html/member/member_primera_mode_list_row.tpl -text
 templates/de/html/member/member_primera_mode_pay.tpl -text
+templates/de/html/member/member_profile_outdated.tpl -text
 templates/de/html/member/member_receive_table.tpl -text
 templates/de/html/member/member_ref_list.tpl -text
 templates/de/html/member/member_ref_list_level.tpl -text