Fixing conflicts
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
<?php
|
<?php
|
||||||
namespace ProcessMaker\BusinessModel;
|
namespace ProcessMaker\BusinessModel;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user