Remove merge conflict indicator

thephpleague · Apr 25, 2018 · e1b5e34 · e1b5e34
1 parent f61ec6c
commit e1b5e34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -22,6 +22,7 @@
     {% endunless %}
     <!--<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />-->
     <link rel="stylesheet" href="/dist/styles.css"/>
+    <base href="https://flysystem.thephpleague.com/" />
 </head>
 <body class="min-h-screen text-base text-indigo-body-text min-w-full pt-12 leading-normal bg-indigo-lightest">
 <!--{% include size-helper.html %}-->
@@ -82,6 +83,9 @@ <h1 class="mb-4">{% if page.alternate_title %}{{ page.alternate_title }}{% else
         </article>
     </div>
 </main>
+<footer class="bg-indigo-darkest text-white">
+
+</footer>
 <script type="text/javascript" src="/dist/main.js"></script>
 <!--<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>-->
 <!--<script type="text/javascript"> docsearch({-->

diff --git a/docs/adapter/phpcr.md b/docs/adapter/phpcr.md
@@ -24,7 +24,6 @@ composer require jackalope/jackalope-doctrine-dbal league/flysystem-phpcr
 Bootstrap your PHPCR implementation. If you chose jackalope-doctrine-dbal with sqlite, 
 this will look like this for example:
 
-<<<<<<< HEAD
 ```php
 use Doctrine\DBAL\Driver\Connection;
 use Doctrine\DBAL\DriverManager;