mirror of
https://github.com/torproject/community.git
synced 2024-12-12 12:35:53 +00:00
Revert previous commit and fix conflicts
This commit is contained in:
parent
b2df2aa3ca
commit
89f7bff151
@ -10,8 +10,4 @@ key: 1
|
||||
---
|
||||
_hidden: yes
|
||||
---
|
||||
_template: layout.html
|
||||
---
|
||||
html: two-columns-page.html
|
||||
---
|
||||
body:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user