fix: conflict

This commit is contained in:
Shivam Mishra 2020-04-20 16:36:52 +05:30
parent 00cb903462
commit ba03e6ee5d

View file

@ -1,16 +1,20 @@
{
"button_gradients": 0,
"button_rounded_corners": 1,
"button_shadows": 0,
"creation": "2015-02-19 13:37:33.925909",
"custom": 0,
"docstatus": 0,
"doctype": "Website Theme",
"font_properties": "300,600",
"idx": 26,
"modified": "2020-04-16 18:23:34.573404",
"idx": 27,
"modified": "2020-04-19 05:34:56.086984",
"modified_by": "Administrator",
"module": "Website",
"name": "Standard",
"owner": "Administrator",
"primary_color": "Blue",
"theme": "Standard",
"theme_scss": "\n\n\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: false;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}",
"theme_url": "/assets/css/standard_a9402c50.css"
"theme_scss": "\n\n$primary: #5e3aa8;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}",
"theme_url": "/assets/css/standard_999ef15b.css"
}