Fixed

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 88c2b6112cbf95e4c5e6ada07bf6045fbae452d8..4d5e54c0cabceb3665a1c84ce0da9b7193f4650f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -355,6 +355,7 @@ inc/modules/admin/what-list_holiday.php -text
 inc/modules/admin/what-list_links.php -text
 inc/modules/admin/what-list_newsletter.php -text
 inc/modules/admin/what-list_norefs.php -text
+inc/modules/admin/what-list_notifications.php -text
 inc/modules/admin/what-list_payouts.php -text
 inc/modules/admin/what-list_primera.php -text
 inc/modules/admin/what-list_rallyes.php -text
@@ -535,7 +536,7 @@ inc/phpmailer/language/phpmailer.lang-fo.php -text
 inc/phpmailer/language/phpmailer.lang-fr.php -text
 inc/phpmailer/language/phpmailer.lang-hu.php -text
 inc/phpmailer/language/phpmailer.lang-it.php -text
-inc/phpmailer/language/phpmailer.lang-ja.php -text svneol=unset#unset
+inc/phpmailer/language/phpmailer.lang-ja.php -text
 inc/phpmailer/language/phpmailer.lang-nl.php -text
 inc/phpmailer/language/phpmailer.lang-no.php -text
 inc/phpmailer/language/phpmailer.lang-pl.php -text
@@ -866,6 +867,7 @@ templates/de/html/admin/admin_del_cats.tpl -text
 templates/de/html/admin/admin_del_cats_row.tpl -text
 templates/de/html/admin/admin_del_email_bonus.tpl -text
 templates/de/html/admin/admin_del_email_normal.tpl -text
+templates/de/html/admin/admin_del_email_notify.tpl -text
 templates/de/html/admin/admin_del_payments.tpl -text
 templates/de/html/admin/admin_del_payments_row.tpl -text
 templates/de/html/admin/admin_del_sponsor.tpl -text
@@ -949,6 +951,8 @@ templates/de/html/admin/admin_list_holiday_row.tpl -text
 templates/de/html/admin/admin_list_links.tpl -text
 templates/de/html/admin/admin_list_links_problem.tpl -text
 templates/de/html/admin/admin_list_links_row.tpl -text
+templates/de/html/admin/admin_list_notify_emails.tpl -text
+templates/de/html/admin/admin_list_notify_emails_row.tpl -text
 templates/de/html/admin/admin_list_payments.tpl -text
 templates/de/html/admin/admin_list_payouts.tpl -text
 templates/de/html/admin/admin_list_payouts_banner.tpl -text