Home Explore Help
Sign In
formation
/
FatboarProject
1
0
Fork 0
Files Issues 0 Pull Requests 1 Wiki
Browse Source

build

formation 3 years ago
parent
bd253f00a5
commit
024d8eadde
1 changed files with 0 additions and 5 deletions
Split View Show Diff Stats
  1. 0 5
      build/docker/apache/apache.conf

+ 0 - 5
build/docker/apache/apache.conf
View File 

@@ -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