From e87d9feb957b25afefc4eee982e76b4a7a045177 Mon Sep 17 00:00:00 2001 From: prashantsinalkar Date: Fri, 13 Sep 2019 15:01:11 +0530 Subject: fixed conflict --- static/website/bootstrap/css/bootstrap-theme.css | 1 - static/website/bootstrap/css/bootstrap-theme.min.css | 1 - static/website/bootstrap/css/bootstrap.css | 1 - static/website/bootstrap/css/bootstrap.min.css | 1 - static/website/bootstrap/fonts/glyphicons-halflings-regular.eot | 1 - static/website/bootstrap/fonts/glyphicons-halflings-regular.svg | 1 - static/website/bootstrap/fonts/glyphicons-halflings-regular.ttf | 1 - static/website/bootstrap/fonts/glyphicons-halflings-regular.woff | 1 - static/website/bootstrap/js/bootstrap.js | 1 - static/website/bootstrap/js/bootstrap.min.js | 1 - static/website/bootstrap/js/jquery-1.11.0.js | 1 - static/website/bootstrap/js/jquery-1.11.0.min.js | 1 - 12 files changed, 12 deletions(-) delete mode 120000 static/website/bootstrap/css/bootstrap-theme.css delete mode 120000 static/website/bootstrap/css/bootstrap-theme.min.css delete mode 120000 static/website/bootstrap/css/bootstrap.css delete mode 120000 static/website/bootstrap/css/bootstrap.min.css delete mode 120000 static/website/bootstrap/fonts/glyphicons-halflings-regular.eot delete mode 120000 static/website/bootstrap/fonts/glyphicons-halflings-regular.svg delete mode 120000 static/website/bootstrap/fonts/glyphicons-halflings-regular.ttf delete mode 120000 static/website/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 120000 static/website/bootstrap/js/bootstrap.js delete mode 120000 static/website/bootstrap/js/bootstrap.min.js delete mode 120000 static/website/bootstrap/js/jquery-1.11.0.js delete mode 120000 static/website/bootstrap/js/jquery-1.11.0.min.js (limited to 'static/website/bootstrap') diff --git a/static/website/bootstrap/css/bootstrap-theme.css b/static/website/bootstrap/css/bootstrap-theme.css deleted file mode 120000 index 0f44776..0000000 --- a/static/website/bootstrap/css/bootstrap-theme.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/css/bootstrap-theme.css \ No newline at end of file diff --git a/static/website/bootstrap/css/bootstrap-theme.min.css b/static/website/bootstrap/css/bootstrap-theme.min.css deleted file mode 120000 index 36ce84b..0000000 --- a/static/website/bootstrap/css/bootstrap-theme.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/css/bootstrap-theme.min.css \ No newline at end of file diff --git a/static/website/bootstrap/css/bootstrap.css b/static/website/bootstrap/css/bootstrap.css deleted file mode 120000 index feb8769..0000000 --- a/static/website/bootstrap/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/css/bootstrap.css \ No newline at end of file diff --git a/static/website/bootstrap/css/bootstrap.min.css b/static/website/bootstrap/css/bootstrap.min.css deleted file mode 120000 index cbdd693..0000000 --- a/static/website/bootstrap/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/css/bootstrap.min.css \ No newline at end of file diff --git a/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot b/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot deleted file mode 120000 index 503f85d..0000000 --- a/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot +++ /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/fonts/glyphicons-halflings-regular.eot \ No newline at end of file diff --git a/static/website/bootstrap/fonts/glyphicons-halflings-regular.svg b/static/website/bootstrap/fonts/glyphicons-halflings-regular.svg deleted file mode 120000 index eaf07d2..0000000 --- a/static/website/bootstrap/fonts/glyphicons-halflings-regular.svg +++ /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/fonts/glyphicons-halflings-regular.svg \ No newline at end of file diff --git a/static/website/bootstrap/fonts/glyphicons-halflings-regular.ttf b/static/website/bootstrap/fonts/glyphicons-halflings-regular.ttf deleted file mode 120000 index 4c1332a..0000000 --- a/static/website/bootstrap/fonts/glyphicons-halflings-regular.ttf +++ /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/fonts/glyphicons-halflings-regular.ttf \ No newline at end of file diff --git a/static/website/bootstrap/fonts/glyphicons-halflings-regular.woff b/static/website/bootstrap/fonts/glyphicons-halflings-regular.woff deleted file mode 120000 index de2a0b6..0000000 --- a/static/website/bootstrap/fonts/glyphicons-halflings-regular.woff +++ /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/fonts/glyphicons-halflings-regular.woff \ No newline at end of file diff --git a/static/website/bootstrap/js/bootstrap.js b/static/website/bootstrap/js/bootstrap.js deleted file mode 120000 index efb26b4..0000000 --- a/static/website/bootstrap/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/js/bootstrap.js \ No newline at end of file diff --git a/static/website/bootstrap/js/bootstrap.min.js b/static/website/bootstrap/js/bootstrap.min.js deleted file mode 120000 index 8d1ad57..0000000 --- a/static/website/bootstrap/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/js/bootstrap.min.js \ No newline at end of file diff --git a/static/website/bootstrap/js/jquery-1.11.0.js b/static/website/bootstrap/js/jquery-1.11.0.js deleted file mode 120000 index 273ba13..0000000 --- a/static/website/bootstrap/js/jquery-1.11.0.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/js/jquery-1.11.0.js \ No newline at end of file diff --git a/static/website/bootstrap/js/jquery-1.11.0.min.js b/static/website/bootstrap/js/jquery-1.11.0.min.js deleted file mode 120000 index 5024049..0000000 --- a/static/website/bootstrap/js/jquery-1.11.0.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/js/jquery-1.11.0.min.js \ No newline at end of file -- cgit