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/images/88x31.png | 1 - static/website/images/NMEICT.png | 1 - static/website/images/ajax-loader.gif | 1 - static/website/images/favicon.ico | 1 - static/website/images/fossee-logo.png | 1 - static/website/images/home-logo.png | 1 - static/website/images/icon-fullscreen.png | 1 - static/website/images/icon-toggle.png | 1 - static/website/images/iitb-logo.png | 1 - static/website/images/r-logo.png | 1 - 10 files changed, 10 deletions(-) delete mode 120000 static/website/images/88x31.png delete mode 120000 static/website/images/NMEICT.png delete mode 120000 static/website/images/ajax-loader.gif delete mode 120000 static/website/images/favicon.ico delete mode 120000 static/website/images/fossee-logo.png delete mode 120000 static/website/images/home-logo.png delete mode 120000 static/website/images/icon-fullscreen.png delete mode 120000 static/website/images/icon-toggle.png delete mode 120000 static/website/images/iitb-logo.png delete mode 120000 static/website/images/r-logo.png (limited to 'static/website/images') diff --git a/static/website/images/88x31.png b/static/website/images/88x31.png deleted file mode 120000 index c40ced4..0000000 --- a/static/website/images/88x31.png +++ /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/images/88x31.png \ No newline at end of file diff --git a/static/website/images/NMEICT.png b/static/website/images/NMEICT.png deleted file mode 120000 index 3b0d4ca..0000000 --- a/static/website/images/NMEICT.png +++ /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/images/NMEICT.png \ No newline at end of file diff --git a/static/website/images/ajax-loader.gif b/static/website/images/ajax-loader.gif deleted file mode 120000 index d50fc20..0000000 --- a/static/website/images/ajax-loader.gif +++ /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/images/ajax-loader.gif \ No newline at end of file diff --git a/static/website/images/favicon.ico b/static/website/images/favicon.ico deleted file mode 120000 index bdff340..0000000 --- a/static/website/images/favicon.ico +++ /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/images/favicon.ico \ No newline at end of file diff --git a/static/website/images/fossee-logo.png b/static/website/images/fossee-logo.png deleted file mode 120000 index b86a1cc..0000000 --- a/static/website/images/fossee-logo.png +++ /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/images/fossee-logo.png \ No newline at end of file diff --git a/static/website/images/home-logo.png b/static/website/images/home-logo.png deleted file mode 120000 index dc14cde..0000000 --- a/static/website/images/home-logo.png +++ /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/images/home-logo.png \ No newline at end of file diff --git a/static/website/images/icon-fullscreen.png b/static/website/images/icon-fullscreen.png deleted file mode 120000 index 419ef77..0000000 --- a/static/website/images/icon-fullscreen.png +++ /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/images/icon-fullscreen.png \ No newline at end of file diff --git a/static/website/images/icon-toggle.png b/static/website/images/icon-toggle.png deleted file mode 120000 index 6a24fa2..0000000 --- a/static/website/images/icon-toggle.png +++ /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/images/icon-toggle.png \ No newline at end of file diff --git a/static/website/images/iitb-logo.png b/static/website/images/iitb-logo.png deleted file mode 120000 index adc0adb..0000000 --- a/static/website/images/iitb-logo.png +++ /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/images/iitb-logo.png \ No newline at end of file diff --git a/static/website/images/r-logo.png b/static/website/images/r-logo.png deleted file mode 120000 index 2163522..0000000 --- a/static/website/images/r-logo.png +++ /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/images/r-logo.png \ No newline at end of file -- cgit