diff --git a/meta/definitions/software.php b/meta/definitions/software.php index aaff563..b3ef6b2 100644 --- a/meta/definitions/software.php +++ b/meta/definitions/software.php @@ -26,7 +26,7 @@ return [ ], [ 'path' => implode(DIRECTORY_SEPARATOR, [ $dir, "view", '' ]), - 'order' => 99, + 'order' => 1000, ], ], diff --git a/view/lean/picto/undraw_error.phtml~ b/view/lean/picto/undraw_error.phtml~ deleted file mode 100644 index 2864b21..0000000 --- a/view/lean/picto/undraw_error.phtml~ +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD - -======= -bug fixing ->>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)