fix merge

src/app/models/beast-orm.ts

@@ -51,24 +51,33 @@ models.register({
   models: [MessageModel, DeleteMessageModel, attachments]
 })
 
+
+
 // // acçoes
 // export class ActionModel  extends models.Model{
+// 	static $tableName = ''
+	
 // 	ProcessId = models.IntegerField({unique: true})
 // 	Description = models.CharField()
 // 	Detail = models.CharField()
 // 	DateBegin = models.CharField()
 // 	DateEnd = models.CharField()
 // 	ActionType = models.CharField()
+
 // }
 
 
 // export class PublicationFolderModel  extends models.Model{
+// 	static $tableName = ''
+
 // 	DateBegin = models.CharField()
 // 	Description = models.CharField()
 // 	Detail = models.CharField()
 // }
 
 // export class PublicationDetailsModel  extends models.Model{
+// 	static $tableName = ''
+
 // 	DateIndex = models.CharField()
 //     DocumentId = models.IntegerField({unique: true})
 //     ProcessId = models.CharField()
@@ -83,6 +92,8 @@ models.register({
 
 
 // export class WebtrixUserModel  extends models.Model {
+// 	static $tableName = ''
+	
 // 	FullName = models.CharField()
 // 	Role = models.CharField()
 // }