Commit d8730831 authored by antoine's avatar antoine

merge global.json

parent da72fc19
......@@ -60,11 +60,7 @@
],
"description": "global unity",
"name": "u",
<<<<<<< HEAD
"value": "15.05",
=======
"value": "30.55",
>>>>>>> b7c5ebb39c7d3b134e02f72d74fdbfc58e9a93ce
"unity": "pt"
},
"ux": {
......@@ -134,19 +130,12 @@
5,
0.1
],
<<<<<<< HEAD
"description": "Droite Vertical Capitale",
"name": "DVC",
"value": "2.6",
"unity": "u"
=======
"description": "Stroke rotation",
"name": "rot",
"value": "307",
"unity": ""
>>>>>>> b7c5ebb39c7d3b134e02f72d74fdbfc58e9a93ce
},
"caps_droite_horizontal": {
"caps_droite_horizontal": {
"type": "range",
"range": [
0,
......@@ -208,4 +197,4 @@
}
}
}
}
\ No newline at end of file
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment