diff options
author | prashantsinalkar | 2019-09-13 15:01:11 +0530 |
---|---|---|
committer | prashantsinalkar | 2019-09-13 16:21:15 +0530 |
commit | e87d9feb957b25afefc4eee982e76b4a7a045177 (patch) | |
tree | 333196a4220402596d50ab110cd68c7308209fd1 /static/website/js | |
parent | 760c6ef028bd4866a81a9e8f00d6c73f828a276c (diff) | |
download | R_on_Cloud_Web_Interface-e87d9feb957b25afefc4eee982e76b4a7a045177.tar.gz R_on_Cloud_Web_Interface-e87d9feb957b25afefc4eee982e76b4a7a045177.tar.bz2 R_on_Cloud_Web_Interface-e87d9feb957b25afefc4eee982e76b4a7a045177.zip |
fixed conflict
Diffstat (limited to 'static/website/js')
l--------- | static/website/js/cloud.js | 1 | ||||
l--------- | static/website/js/codemirror.js | 1 | ||||
l--------- | static/website/js/fullscreen.js | 1 | ||||
l--------- | static/website/js/javascript.js | 1 | ||||
l--------- | static/website/js/jquery-1.10.2.min.js | 1 | ||||
l--------- | static/website/js/jsdiff.js | 1 | ||||
l--------- | static/website/js/lightbox_me.js | 1 | ||||
l--------- | static/website/js/placeholder.js | 1 | ||||
l--------- | static/website/js/review.js | 1 |
9 files changed, 0 insertions, 9 deletions
diff --git a/static/website/js/cloud.js b/static/website/js/cloud.js deleted file mode 120000 index 19d542d..0000000 --- a/static/website/js/cloud.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/js/cloud.js
\ No newline at end of file diff --git a/static/website/js/codemirror.js b/static/website/js/codemirror.js deleted file mode 120000 index 4c59982..0000000 --- a/static/website/js/codemirror.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/js/codemirror.js
\ No newline at end of file diff --git a/static/website/js/fullscreen.js b/static/website/js/fullscreen.js deleted file mode 120000 index 54e6ca6..0000000 --- a/static/website/js/fullscreen.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/js/fullscreen.js
\ No newline at end of file diff --git a/static/website/js/javascript.js b/static/website/js/javascript.js deleted file mode 120000 index bfdaf08..0000000 --- a/static/website/js/javascript.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/js/javascript.js
\ No newline at end of file diff --git a/static/website/js/jquery-1.10.2.min.js b/static/website/js/jquery-1.10.2.min.js deleted file mode 120000 index 885a414..0000000 --- a/static/website/js/jquery-1.10.2.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/js/jquery-1.10.2.min.js
\ No newline at end of file diff --git a/static/website/js/jsdiff.js b/static/website/js/jsdiff.js deleted file mode 120000 index 57c6486..0000000 --- a/static/website/js/jsdiff.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/js/jsdiff.js
\ No newline at end of file diff --git a/static/website/js/lightbox_me.js b/static/website/js/lightbox_me.js deleted file mode 120000 index 985679a..0000000 --- a/static/website/js/lightbox_me.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/js/lightbox_me.js
\ No newline at end of file diff --git a/static/website/js/placeholder.js b/static/website/js/placeholder.js deleted file mode 120000 index 3b787b3..0000000 --- a/static/website/js/placeholder.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/js/placeholder.js
\ No newline at end of file diff --git a/static/website/js/review.js b/static/website/js/review.js deleted file mode 120000 index ae909d5..0000000 --- a/static/website/js/review.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/js/review.js
\ No newline at end of file |