raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=50eadee0f3d03ac88f72809fa1bfda8404a2ea0d
commit 50eadee0f3d03ac88f72809fa1bfda8404a2ea0d Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Mon May 30 17:50:10 2016 +0900 fix conflict --- pages/start-release.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pages/start-release.txt b/pages/start-release.txt index 8ef3c4f..d2e7958 100644 --- a/pages/start-release.txt +++ b/pages/start-release.txt @@ -1,7 +1,3 @@ <note> EFL 1.17.1 and Enlightenment 0.21.0-beta are out - go to our [[download]] page. -<<<<<<< HEAD </note> -======= -</note> ->>>>>>> e87ff8f5d0b5a753318faa07f84fc8048d28f523 --
