Redirect to documentation added
Conflicts:
documentation/01-Introduction.php
Signed-off-by: Francesco Guidieri <francesco.guidieri@gmail.com>
diff --git a/documentation/01-Introduction.php b/documentation/01-Introduction.php
index d616d37..775293a 100644
--- a/documentation/01-Introduction.php
+++ b/documentation/01-Introduction.php
@@ -1,5 +1 @@
-<<<<<<< Upstream, based on origin/master
-<?php header('Location: https://www.eclipse.org/emf-parsley/documentation.html'); ?>
-=======
<?php header("Location: https://www.eclipse.org/emf-parsley/documentation.html"); ?>
->>>>>>> 6dc1c32 Redirect to documentation added
