Fix a merge issue 18/4318/1
Sylvestre Ledru [Fri, 24 Jun 2011 15:51:02 +0000 (17:51 +0200)]
Change-Id: Ic2b8a981c341643f76936b053b12b859999b1966

git_hooks/pre-commit

index a3bcada..34585eb 100755 (executable)
@@ -54,7 +54,6 @@ then
        echo
 fi
 
-<<<<<<< HEAD
 if test -z "$(git config --get-all indent.ignored)"
 then
        echo "Unable to find indent ignored list on the configuration, ignored"
@@ -69,9 +68,6 @@ else
        INDENT_IGNORED="$(find $(git config --get-all indent.ignored))"
 fi
 
-=======
-#
->>>>>>> 465c595... deactivate pre-commit on in-progress state
 # indent / format file by type
 #
 indent() {