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)