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
+25 -25
View File
@@ -1,25 +1,25 @@
/*
Title: internal_script_error
Description: error class to be caught inside our C code
*/
package script;
class internal_script_error extends Error
{
private Error wrappedError = null;
internal_script_error()
{
}
internal_script_error(String message)
{
super(message);
}
internal_script_error(Error err)
{
wrappedError = err;
}
} // class internal_script_error
/*
Title: internal_script_error
Description: error class to be caught inside our C code
*/
package script;
class internal_script_error extends Error
{
private Error wrappedError = null;
internal_script_error()
{
}
internal_script_error(String message)
{
super(message);
}
internal_script_error(Error err)
{
wrappedError = err;
}
} // class internal_script_error