removing the redundant nginx config files

nginx.conf

-#
-# Set YOUR_DOMAIN below to make this work
-#
-server {
-    # add [IP-Address:]80 in the next line if you want to limit this to a single interface
-    listen 0.0.0.0:80;
-
-    server_name YOUR_DOMAIN;
-
-    root /var/www/html;
-    index index.php;
-
-    # change the file name of these logs to include your server name
-    # if hosting many services...
-    access_log /var/log/nginx/grav.local_access.log;
-    error_log /var/log/nginx/grav.local_error.log;
-
-    location / {
-        proxy_pass http://127.0.0.1:8080;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Conection "upgrade";
-        proxy_set_header Host $http_host;
-    }
-}

nginx/default.conf

-server {
-    listen 0.0.0.0:80;
-    index index.html index.php;
-
-    ## Web root and Domain Name
-    root /var/www/html;
-    server_name default;
-
-    ## Begin - Index
-    # for subfolders, simply adjust the rewrite:
-    # to use `/subfolder/index.php`
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-        #try_files $uri $uri/ /index.php;
-    }
-    ## End - Index
-
-    ## Begin - Security
-    # deny all direct access for these folders
-    location ~* /(\.git|cache|bin|logs|backup|tests)/.*$ { return 403; }
-    # deny running scripts inside core system folders
-    location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
-    # deny running scripts inside user folder
-    location ~* /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
-    # deny access to specific files in the root folder
-    location ~ /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; }
-    ## End - Security
-
-    ## Begin - PHP
-    location ~ \.php$ {
-        # Choose either a socket or TCP/IP address
-        #fastcgi_pass unix:/var/run/php5-fpm.sock;
-        fastcgi_pass app:9000;
-
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-    }
-    client_max_body_size 100m;
-<<<<<<< HEAD
- 
-    ## Begin - Security
-    # deny all direct access for these folders
-    location ~* /(\.git|cache|bin|logs|backups)/.*$ { return 403; }
-    # deny running scripts inside core system folders
-    location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
-    # deny running scripts inside user folder
-    location ~* /user/.*\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
-    # deny access to specific files in the root folder
-    location ~ /(LICENSEi\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; }
-    ## End - Security
-=======
-    ## End - PHP
->>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535
- }