%!s(int64=3) %!d(string=hai) anos · 024d8eadde
--- a/build/docker/apache/apache.conf
+++ b/build/docker/apache/apache.conf
@@ -20,13 +20,8 @@
 
				 
			
 
				 <VirtualHost *:443>
			
 
				    DocumentRoot /var/www/html
			
 
				-<<<<<<< HEAD
			
 
				-   ServerName angular-preprod.foodgame.fr
			
 
				-   ServerAlias angular-preprod.foodgame.fr
			
 
				-=======
			
 
				    ServerName angular-prod.foodgame.fr
			
 
				    ServerAlias angular-prod.foodgame.fr
			
 
				->>>>>>> dev
			
 
				    #SSLEnable
			
 
				    #SSLEngine ON
			
 
				    #SSLCertificateFile path/to/server.crt