From e934c1a92c4b43c9d015972067ef9e53f59ef3ad Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Wed, 25 Feb 2026 19:43:32 +0000 Subject: [PATCH] -Rebasing --- view/lean/picto/undraw_error.phtml~ | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 view/lean/picto/undraw_error.phtml~ diff --git a/view/lean/picto/undraw_error.phtml~ b/view/lean/picto/undraw_error.phtml~ new file mode 100644 index 0000000..8fc90fb --- /dev/null +++ b/view/lean/picto/undraw_error.phtml~ @@ -0,0 +1,12 @@ +<<<<<<< HEAD +<<<<<<< HEAD + +======= +bug fixing +>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates) +======= +bug fixing +======= + +>>>>>>> fdca37a (- Added createStream methods and fixed multiple errors views) +>>>>>>> d74c916 (- Added createStream methods and fixed multiple errors views)