Revert "New manual"

myparcelnl · Jan 14, 2020 · 510a3a0 · 510a3a0
1 parent ec93b73
commit 510a3a0
Show file tree

Hide file tree

Showing 74 changed files with 654 additions and 909 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 # Magento 1
 Voor de handleiding en meer informatie ga naar: 
 https://myparcelnl.github.io/magento1/
+=======
+# magento1-handleiding
+Voor de handleiding ga naar https://myparcelnl.github.io/magento1
+>>>>>>> parent of fc87f60... New manual
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/github-light.css b/css/github-light.css
diff --git a/css/normalize.css b/css/normalize.css