Even more conflicting calls fixed

[shipsimu.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index dccadbfe87970bb1c548de91d4c1ef1cfc4951ce..e3d7b8cc61fa77ecb0c68e0e76881cf8ffc2442d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -204,8 +204,10 @@ inc/classes/exceptions/crypto/.htaccess -text
 inc/classes/exceptions/crypto/class_EncryptInvalidLengthException.php -text
 inc/classes/exceptions/crypto/class_EncryptMissingException.php -text
 inc/classes/exceptions/database/.htaccess -text
 inc/classes/exceptions/crypto/class_EncryptInvalidLengthException.php -text
 inc/classes/exceptions/crypto/class_EncryptMissingException.php -text
 inc/classes/exceptions/database/.htaccess -text

+inc/classes/exceptions/database/class_ -text

 inc/classes/exceptions/database/class_DatabaseException.php -text
 inc/classes/exceptions/database/general/.htaccess -text
 inc/classes/exceptions/database/class_DatabaseException.php -text
 inc/classes/exceptions/database/general/.htaccess -text

+inc/classes/exceptions/database/general/class_DatabaseUpdateSupportException.php -text

 inc/classes/exceptions/database/general/class_SqlException.php -text
 inc/classes/exceptions/database/local_file/.htaccess -text
 inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php -text
 inc/classes/exceptions/database/general/class_SqlException.php -text
 inc/classes/exceptions/database/local_file/.htaccess -text
 inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php -text


@@ -315,6 +317,7 @@ inc/classes/interfaces/crypto/.htaccess -text
 inc/classes/interfaces/crypto/class_Cryptable.php -text
 inc/classes/interfaces/database/.htaccess -text
 inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php -text
 inc/classes/interfaces/crypto/class_Cryptable.php -text
 inc/classes/interfaces/database/.htaccess -text
 inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php -text

+inc/classes/interfaces/database/class_Updateable.php -text

 inc/classes/interfaces/database/frontend/.htaccess -text
 inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php -text
 inc/classes/interfaces/database/middleware/.htaccess -text
 inc/classes/interfaces/database/frontend/.htaccess -text
 inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php -text
 inc/classes/interfaces/database/middleware/.htaccess -text