fix conflicts

src/webcards.cxx

@@ -129,11 +129,6 @@ void visitOfPage(char * argument)
 		fclose(pVisits);
 	}
 }
-void endOfPage(void)
-{
-	std::cout << " </body>"
-		<< std::endl;
-}
 string::size_type parseArguments(arguments_t &arguments)
 {
 	/* All the possible arguments */
@@ -563,13 +558,22 @@ int main (int argc, char** argv)
 			std::cout << i << std::endl;
 	}
 
-	FOOTERTEXT;
-	endOfPage();
+std::cout << "\n      </td>\n     </tr>\n    </table>\n" \
+  << "    <footer>\n     <p>\n" \
+  << "      &copy; 2007 - 2024 <a href=\".\">NuTyX</a>.\n    <br>\n" \
+  << "   Generated by cards " <<  VERSION  << " in ";
 
 	high_resolution_clock::time_point t2 = high_resolution_clock::now();
 	duration<double> time_span = duration_cast<duration<double>>((t2 - t1)*1000);
-	std::cout << time_span.count()
-		<< " mS\n</html>\n";
+
+std::cout << time_span.count() << " mS \n   <br><br>\n" \
+    << "Hosted by <a href=\"http://tuxfamily.org\"><img src=\"../graphics/logo_tuxfamily_50.png\"/></a><br><br>\n" \
+    << "     <a href=\"http://www.wtfpl.net/\">\n" \
+    << "     <img src=\"http://www.wtfpl.net/wp-content/uploads/2012/12/wtfpl-badge-4.png\"\n" \
+    << "     width=\"80\" height=\"15\" alt=\"WTFPL\" /></a> \n" \
+    << "    </footer>\n" \
+    << " </body>\n</html>" \
+    << std::endl;
 
 	return 0;
 }

src/www/config_webcards.h

@@ -31,18 +31,6 @@
 	<< "   </head>" \
 	<< endl
 
-#define FOOTERTEXT   cout << "\n      </td>\n     </tr>\n    </table>\n" \
-  << "    <footer>\n" \
-  << "     <p> Powered by cards " <<  VERSION \
-  << "     &copy; 2007 - 2024 " \
-  << "<a href=\".\">NuTyX</a>.<br><br>\n" \
-  << "Hosted by <a href=\"http://tuxfamily.org\"><img src=\"../graphics/logo_tuxfamily_50.png\"/></a><br><br>\n" \
-  << "     <a href=\"http://www.wtfpl.net/\">\n" \
-  << "     <img src=\"../graphics/logo_wtfpl_80.png\"\n" \
-  << "     width=\"80\" height=\"15\" alt=\"WTFPL\" /></a> \n" \
-  << "    </footer>\n"
-
-
 #define SEARCH cout << "   <div>\n" \
   << "  <form method=\"get\" action=\".\">\n" \
   << "     <fieldset>\n" \