diff --git a/view/lean/picto/undraw_error.phtml b/view/lean/picto/undraw_error.phtml index 6ed7924..9ab3d82 100644 --- a/view/lean/picto/undraw_error.phtml +++ b/view/lean/picto/undraw_error.phtml @@ -1 +1,5 @@ -bug fixing \ No newline at end of file +<<<<<<< HEAD +bug fixing +======= + +>>>>>>> e2672c4 (- Added createStream methods and fixed multiple errors views)