Commit c8b14141 authored by sarah's avatar sarah
Browse files

conflict merge

parent 151869c3
public/
node_modules/
{"version":1,"timestamp":1569336664708,"graph":{"options":{"directed":true,"multigraph":false,"compound":false},"nodes":[{"v":"03-templates/base.twig","value":{"compileState":"clean"}},{"v":"03-templates/repo.twig","value":{"compileState":"clean"}},{"v":"02-organisms/commit-list.twig","value":{"compileState":"clean"}}],"edges":[]}}
{"version":1,"timestamp":1569932110702,"graph":{"options":{"directed":true,"multigraph":false,"compound":false},"nodes":[{"v":"03-templates/base.twig","value":{"compileState":"clean"}},{"v":"03-templates/repo.twig","value":{"compileState":"clean"}},{"v":"02-organisms/commit-list.twig","value":{"compileState":"clean"}},{"v":"02-organisms/tree-list.twig","value":{"compileState":"clean"}}],"edges":[]}}
......@@ -15,5 +15,16 @@
"author": "Sarah Magnan",
"msg": "svg file of final versions"
}
},
"trees": {
"1": {
"name": "communication"
},
"2": {
"name": "fonts"
},
"3": {
"name": "iceberg"
}
}
}
......@@ -4,5 +4,6 @@
<h1>{{ title }}</h1>
{% include "@organisms/commit-list.twig" %}
{% include "@organisms/tree-list.twig" %}
{% endblock content %}
body {
background-color: pink;
background-color: yellow;
}
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