commit 89f7bff151c6fda4611c2b5351f35bbea6052350 Author: hiro hiro@torproject.org Date: Mon Oct 21 18:21:09 2019 +0200
Revert previous commit and fix conflicts --- content/user-research/become-tester/contents.lr | 4 ---- content/user-research/guidelines/contents.lr | 1 + 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 5dfa354..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -10,8 +10,4 @@ key: 1 --- _hidden: yes --- -_template: layout.html ---- -html: two-columns-page.html ---- body: diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 247654c..66ad447 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -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