forgot to save after fixing merge conflict

2026-07-07 19:53:04 +02:00 · 2015-01-26 02:43:52 +01:00
parent e268cda1b5
commit ef7806b509
1 changed files with 1 additions and 3 deletions
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -104,11 +104,9 @@ trait ParsedownGravTrait

            //get the url and parse it
            $url = parse_url(htmlspecialchars_decode($excerpt['element']['attributes']['src']));
-<<<<<<< HEAD
-=======
+
            $path_parts = pathinfo($url['path']);

->>>>>>> 304c7519d14945d6b69bc83ecb89dbf5b3fbbee3
            // if there is no host set but there is a path, the file is local
            if (!isset($url['host']) && isset($url['path'])) {