odstranani merge tagu

src/warden-server/sh/update.sh

@@ -281,7 +281,6 @@ doTemplate \
 
 # update Apache configuration file
 echo -n "Updating Apache configuration file ... "
-<<<<<<< HEAD
 cert_file_tmp=`fgrep SSLCertificateFile $apache_conf`
 key_file_tmp=`fgrep SSLCertificateKeyFile $apache_conf`
 ca_file_tmp=`fgrep SSLCACertificateFile $apache_conf`
@@ -290,7 +289,6 @@ cert_file=${cert_file_tmp##*" "}
 key_file=${key_file_tmp##*" "}
 ca_file=${ca_file_tmp##*" "}
 lib=${lib_tmp##*" "}
->>>>>>> ced3b6d0c942211d77a5763d722ec616009be87f
 doTemplate \
         _CERT_FILE_     "$cert_file" \
         _KEY_FILE_      "$key_file" \