Remove merge stuff

src/freedombone-app-peertube

@@ -1084,7 +1084,6 @@ function install_peertube {
     function_check install_nodejs
     install_nodejs peertube
 
-<<<<<<< HEAD
     if [ ! -f /usr/local/bin/npm ]; then
         cp "/root/.npm-global/bin/npm" "/usr/local/bin/npm"
     fi
@@ -1092,8 +1091,6 @@ function install_peertube {
         cp "/root/.npm-global/bin/npm" "/usr/bin/npm"
     fi
 
-=======
->>>>>>> parent of e578405c... Copying npm
     install_peertube_base
 
     PEERTUBE_ONION_HOSTNAME=$(add_onion_service peertube 80 ${PEERTUBE_ONION_PORT})