summaryrefslogtreecommitdiff
path: root/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot
diff options
context:
space:
mode:
authorprashantsinalkar2019-10-02 20:32:05 +0530
committerprashantsinalkar2019-10-02 20:32:05 +0530
commitcb37e15ceb336de7ba94d90805ef1531c47d5c96 (patch)
tree9cba0c741a7cfe3222e2c17401e72b2acc8dedf7 /static/website/bootstrap/fonts/glyphicons-halflings-regular.eot
parent76dcbadbf71febe93fb9d2ffd51b2f3ae54233a2 (diff)
parent070cb90095df4ab5bc7b6e28fd13bb12df29e1f7 (diff)
downloadR_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.tar.gz
R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.tar.bz2
R_on_Cloud_Web_Interface-cb37e15ceb336de7ba94d90805ef1531c47d5c96.zip
fixed conflict
Diffstat (limited to 'static/website/bootstrap/fonts/glyphicons-halflings-regular.eot')
-rw-r--r--static/website/bootstrap/fonts/glyphicons-halflings-regular.eotbin20290 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot b/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 423bd5d..0000000
--- a/static/website/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ /dev/null
Binary files differ