fixes

blabla1337 · Oct 22, 2020 · 5bb04b4 · 5bb04b4
1 parent bdb1b94
commit 5bb04b4
Show file tree

Hide file tree

Showing 74 changed files with 111 additions and 3,921 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,4 @@ lib
 bin
 bin64
 include
-<<<<<<< HEAD
 venv
-=======
->>>>>>> origin/master
diff --git a/Docker/alpine-cloud/angular/entrypoint.sh b/Docker/alpine-cloud/angular/entrypoint.sh
@@ -2,23 +2,11 @@
 
 set -ex
 
-<<<<<<< HEAD
 ORIGIN=${FRONTEND_URI:-http://127.0.0.1:8888}
 
 echo "angular will try to contact the api at: ${ORIGIN}/api"
 find /usr/share/nginx/html -type f -exec sed -i -e "s,http://127.0.0.1:8888,${ORIGIN},g" {} \;
 cp $1 /etc/nginx/conf.d/site.conf
 cat /etc/nginx/conf.d/site.conf
 find /usr/share/nginx/html -type f -exec sed -i -e "s,skiploginprovider,skfprovider,g" {} \;
-=======
-ORIGIN=${FRONTEND_URI:-http://127.0.0.1:8788}
-
-echo "angular will try to contact the api at: ${ORIGIN}/api"
-find /usr/share/nginx/html -type f -exec sed -i -e "s,http://127.0.0.1:8888/api,${ORIGIN}/api,g" {} \;
-# grep -r "${BACKEND}" $1
-
-cp $1 /etc/nginx/conf.d/site.conf
-cat /etc/nginx/conf.d/site.conf
-
->>>>>>> origin/master
 exec nginx -g "daemon off;"
diff --git a/README.md b/README.md
@@ -6,10 +6,7 @@
 [![Join the chat at https://gitter.im/Security-Knowledge-Framework/Lobby](https://badges.gitter.im/Security-Knowledge-Framework/Lobby.svg)](https://gitter.im/Security-Knowledge-Framework/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Join the chat at https://owasp.slack.com/messages/C0F7L9X6V](https://img.shields.io/badge/chat-on%20slack-blueviolet)](https://owasp.slack.com/messages/C0F7L9X6V)
 [![OWASP Flagship](https://img.shields.io/badge/owasp-flagship%20project-orange.svg)](https://www.owasp.org/index.php/OWASP_Security_Knowledge_Framework)
-<<<<<<< HEAD
 [![OSSF Working group: Best Practices for Open Source Developers](https://openssf.org/wp-content/uploads/sites/112/2020/07/openssf-color.svg)](https://openssf.org)
-=======
->>>>>>> origin/master
 
 <br>Quality testing:<br>
 [![Known Vulnerabilities](https://snyk.io/test/github/blabla1337/skf-flask/badge.svg)](https://snyk.io/test/github/blabla1337/skf-flask)
@@ -43,18 +40,10 @@ The second stage is validating if the developer properly implemented different s
 
 ## <a name="installing"></a>Installing
 
-<<<<<<< HEAD
 ### [Kubernetes installation how to](https://github.com/blabla1337/skf-flask/tree/master/installations/Kubernetes)  
 ### [Bare metal / on premise installation how to](https://github.com/blabla1337/skf-flask/tree/master/installations/local)  
 ### [Docker-compose local how to](https://github.com/blabla1337/skf-flask/tree/master/installations/docker)  
 ### [SKF K8s Raspberry pi cluster how to](https://github.com/blabla1337/skf-flask/tree/master/installations/pi-cluster)  
-=======
-### [Local on premise installation how to](https://github.com/blabla1337/skf-flask/tree/master/installations/local)  
-### [Docker local installation how to](https://github.com/blabla1337/skf-flask/tree/master/installations/docker)  
-### [Kubernetes installation how to](https://github.com/blabla1337/skf-flask/tree/master/installations/Kubernetes)  
-### [Azure installation how to](https://github.com/blabla1337/skf-flask/tree/master/installations/azure-deployment)  
-
->>>>>>> origin/master
 ### [SKF Chatbot installation how to](https://github.com/blabla1337/skf-bot)  
 
 ## <a name="updating-db"></a>Updating Database
@@ -213,9 +202,6 @@ Licensed under the [creative commons](http://creativecommons.org/licenses/by-nd/
 - Semen Rozhkov
 - Mehtab Zafar 
 - Daniel Spilsbury
-<<<<<<< HEAD
 - Akash M
 - Tess Sluijter
 - Xavier Rene-Corail
-=======
->>>>>>> origin/master
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,4 @@ lib @@
     bin
     bin64
     include
-    <<<<<<< HEAD
     venv
-    =======
-    >>>>>>> origin/master