Fixed merge issues.

This commit is contained in:
Cekis
2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
+19 -19
View File
@@ -1,19 +1,19 @@
/*
Title: internal_script_exception
Description: exception class to be caught inside our C code
*/
package script;
class internal_script_exception extends Exception
{
internal_script_exception()
{
}
internal_script_exception(String message)
{
super(message);
}
} // class internal_script_exception
/*
Title: internal_script_exception
Description: exception class to be caught inside our C code
*/
package script;
class internal_script_exception extends Exception
{
internal_script_exception()
{
}
internal_script_exception(String message)
{
super(message);
}
} // class internal_script_exception