diff --git a/cfp-en_fred.md b/cfp-en_fred.md deleted file mode 100644 index b0fe4b4..0000000 --- a/cfp-en_fred.md +++ /dev/null @@ -1,50 +0,0 @@ -## THSF 2016 Call for Participation (EN) -## May 19th-22nd 2016, Mixart`Myrys (Toulouse, France) - - -# About THSF -<<<<<<< HEAD -TOULOUSE HACKER SPACE FACTORY is a four days annual event organized by Tetalab (a hackerspace), - Tetaneutral (a non-profit internet provider) and Mixart`Myrys (an autonomous artist collective). -The intention is to gather hackers, performers, makers, social thinkers, artists and curious people to learn, share, hack, code, have fun with technologies, and chill out together. - - - -======= -TOULOUSE HACKER SPACE FACTORY is a four days long meeting - - - -organized by Tetalab, Tetaneutral and Mixart`Myrys. ->>>>>>> dec9f00d57407721fc3ee02b9d882339260adf03 - -curious people for conferences, workshops, live perfomance, and artistic proposals - - -# THSF7 -This year will be the 7th edition - - - -# Submission guidelines -This CFP is open to hackers, performers, makers, social thinkers and artists - - - - -# Travel, costs and accomodations - - - -# Dates -April 4, 2016: Deadline for submissions -May 19-22, 2016: THSF event - - - - - - - - -