* Fixed merge issues.

Signed-off-by: Digimer <digimer@alteeve.ca>

cgi-bin/home

@@ -69,31 +69,18 @@ my $header = $anvil->Template->get({file => "main.html", name => "header", varia
 my $body   = "";
 
 # If any jobs are pending/running, show the "unavailable" option.
-<<<<<<< HEAD
 my $available = check_availability($anvil);
 $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { available => $available }});
-=======
-my $available  = check_availability($anvil);
-my $configured = check_if_configured($anvil);
-$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
-	available  => $available,
-	configured => $configured,
-}});
->>>>>>> a6a5df2496cbe4474d34585a2d41207dd6d5e005
 if (not $available)
 {
 	# Set the body to 'say::maintenance'.
 	$body = $anvil->data->{say}{maintenance};
 }
-<<<<<<< HEAD
 
 # If there is no user account yet, then the system is new and needs to be reconfigured.
 my $configured = check_if_configured($anvil);
 $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { configured => $configured }});
 if (not $configured)
-=======
-elsif (not $configured)
->>>>>>> a6a5df2496cbe4474d34585a2d41207dd6d5e005
 {
 	$body = configure_striker($anvil);
 }

html/skins/alteeve/main.css

@@ -10,7 +10,6 @@ Colours;
 - Footer text:       #515151
 */
 
-<<<<<<< HEAD
 .login {
     width:       600px;
     height:      50px;
@@ -19,40 +18,6 @@ Colours;
     margin-top:  -25px;  /* half of height */
     top:         50%;
     left:        50%;
-=======
-input[type=submit]:hover {
-	border: 1px solid #f7f7f7;
-}
-
-input[type=submit] {
-	padding:               3px 10px;
-	background:            #f7f7f7; 
-	border:                1px solid #343434;
-	cursor:                pointer;
-	-webkit-border-radius: 2px;
-	border-radius:         3px; 
-	font-family:           'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif;
-	text-decoration:       none;
-	color:                 #343434;
-	font-size:             1.0em;
-}
-
-.button:hover {
-	border: 1px solid #f7f7f7;
-}
-
-.button {
-	padding:               3px 10px; 
-	background:            #f7f7f7; 
-	border:                1px solid #343434;
-	cursor:                pointer;
-	-webkit-border-radius: 2px;
-	border-radius:         3px; 
-	font-family:           'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif;
-	text-decoration:       none;
-	color:                 #343434;
-	font-size:             1.0em;
->>>>>>> a6a5df2496cbe4474d34585a2d41207dd6d5e005
 }
 
 .error_message {
@@ -104,8 +69,8 @@ select {
 }
 
 body {
-	font-family:       'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif;
-	background-image:  url("/skins/alteeve/images/Texture.jpg");
+	font-family: 'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif;
+	background-image: url("/skins/alteeve/images/Texture.jpg");
 	background-repeat: repeat;
 	color:             #f2f2f2;
 }