Commit 06f1040c authored by Gavriel Amira's avatar Gavriel Amira

fix conflict

parent f50791c4
......@@ -27,7 +27,5 @@ the project manager job is to give you the freedom and move out the way all the
(For now we have only one project manager....Gavriel Amira)
# Content production
One of the greatest overall perks of the 20% project is to have a shareable outcome, perhaps in the form of blog content. This content can also be a knowledge sharing session, a mini-project or even internal wiki track about the topic.
>>>>>>> origin
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