Revert previous commit and fix conflicts

This commit is contained in:
hiro 2019-10-21 18:21:09 +02:00
parent b2df2aa3ca
commit 89f7bff151
2 changed files with 1 additions and 4 deletions

View File

@ -10,8 +10,4 @@ key: 1
---
_hidden: yes
---
_template: layout.html
---
html: two-columns-page.html
---
body:

View File

@ -8,6 +8,7 @@ title: User Research Guidelines
---
subtitle: We collect only necessary data to improve our services.
---
>>>>>>> parent of 1e624ba... update content status
key: 3
---
html: two-columns-page.html