fixed conflict

22 files changed, 0 insertions, 22 deletions

diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-grid.css b/static/website/bootstrap-4.1.0/css/bootstrap-grid.css
deleted file mode 120000
index 126d4a1..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-grid.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-grid.css
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-grid.css.map b/static/website/bootstrap-4.1.0/css/bootstrap-grid.css.map
deleted file mode 120000
index e4f631f..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-grid.css.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-grid.css.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css b/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css
deleted file mode 120000
index 8aa4c5c..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css.map b/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css.map
deleted file mode 120000
index d656349..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-grid.min.css.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css b/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css
deleted file mode 120000
index 8aed04e..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css.map b/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css.map
deleted file mode 120000
index 20651e0..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-reboot.css.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css b/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css
deleted file mode 120000
index f92ab4a..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map b/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map
deleted file mode 120000
index 56c0c0a..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap-reboot.min.css.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap.css b/static/website/bootstrap-4.1.0/css/bootstrap.css
deleted file mode 120000
index 0f7b623..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap.css
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap.css.map b/static/website/bootstrap-4.1.0/css/bootstrap.css.map
deleted file mode 120000
index 9adb091..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap.css.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap.css.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap.min.css b/static/website/bootstrap-4.1.0/css/bootstrap.min.css
deleted file mode 120000
index 0ce6414..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap.min.css
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap.min.css
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/css/bootstrap.min.css.map b/static/website/bootstrap-4.1.0/css/bootstrap.min.css.map
deleted file mode 120000
index d9cb4ee..0000000
--- a/static/website/bootstrap-4.1.0/css/bootstrap.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/css/bootstrap.min.css.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js b/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js
deleted file mode 120000
index 97b3251..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js.map b/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js.map
deleted file mode 120000
index cb0d2a6..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.bundle.js.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js b/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js
deleted file mode 120000
index 0c2b955..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map b/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map
deleted file mode 120000
index e206f00..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.bundle.min.js.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.js b/static/website/bootstrap-4.1.0/js/bootstrap.js
deleted file mode 120000
index a14b588..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.js
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.js.map b/static/website/bootstrap-4.1.0/js/bootstrap.js.map
deleted file mode 120000
index 790c628..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.js.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.js.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.min.js b/static/website/bootstrap-4.1.0/js/bootstrap.min.js
deleted file mode 120000
index a6c8bce..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.min.js
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.min.js
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/bootstrap.min.js.map b/static/website/bootstrap-4.1.0/js/bootstrap.min.js.map
deleted file mode 120000
index f071563..0000000
--- a/static/website/bootstrap-4.1.0/js/bootstrap.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/bootstrap.min.js.map
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/jquery.min.js b/static/website/bootstrap-4.1.0/js/jquery.min.js
deleted file mode 120000
index 7ac34de..0000000
--- a/static/website/bootstrap-4.1.0/js/jquery.min.js
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/jquery.min.js
\ No newline at end of file
diff --git a/static/website/bootstrap-4.1.0/js/popper.min.js b/static/website/bootstrap-4.1.0/js/popper.min.js
deleted file mode 120000
index abdff14..0000000
--- a/static/website/bootstrap-4.1.0/js/popper.min.js
+++ /dev/null
@@ -1 +0,0 @@
-/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/bootstrap-4.1.0/js/popper.min.js
\ No newline at end of file