@@ -4,9 +4,6 @@ examples/webos/**/*.js
# Ignoring compiled files in st
st/*.js
-<<<<<<< HEAD
# In case amber is also saved in a local Subversion
.svn
-=======
->>>>>>> upstream/master
Laurent Laffont