Differences between revisions 18 and 23 (spanning 5 versions)

The Groups

No.

Name

Logo

Slogan

Leader

Members

$/!\$ Edit conflict - other version:

1	Vision	Violynne Wang	Johannes Schwarz, Xia Anbang, Harshnika
2	Hapdevs	Leo Thevenet	Sajjad Kamali siahroudi, Pouneh Soleimaninejadian, Kovtun Valery
3	Shaman	Niklas Stoehr	Daniel Swaab, Thiago de Sousa Silveira, Seth Schmitz
4	WeDo	Annabelle Trinh	Olivier Lapraye, Zhansaya Yussupova, Tino Xaver Schlosser
5	T-Mafia	Hasan Iqbal	Wahidul Alam, Nina Alef, 赛义德

$/!\$ Edit conflict - your version:

1	Vision		Violynne Wang	Johannes Schwarz, Xia Anbang, Harshnika
2	Hapdevs	All hail Leader!	Leo Thevenet	Sajjad Kamali siahroudi, Pouneh Soleimaninejadian, Kovtun Valery
3	Shaman	Healthcare in your pocket.	Niklas Stoehr	Daniel Swaab, Thiago de Sousa Silveira, Seth Schmitz
4	WeDo	You dream, WeDo.	Annabelle Trinh	Olivier Lapraye, Zhansaya Yussupova, Tino Xaver Schlosser
5	T-Mafia	You never walk alone.	Hasan Iqbal	Wahidul Alam, Nina Alef, 赛义德

$/!\$ End of edit conflict

-  ⇤ ← Revision 18 as of 2016-09-27 02:38:39 → 
  Size: 571
  Editor: ZhangYong
  Comment:
+   ← Revision 23 as of 2016-10-11 04:49:00 → ⇥
  Size: 1329
  Editor: 166
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 4:
-||1 ||[[/01|Vision]]|| || ||Violynne Wang ||Johannes Schwarz, 夏安邦, Harshnika ||
+---- /!\ '''Edit conflict - other version:''' ----
||1 ||[[/01|Vision]]|| || ||Violynne Wang ||Johannes Schwarz, Xia Anbang, Harshnika ||
-Line 7:
+Line 9:
-||4 ||[[/04|WeDo]] || || ||Annabelle Trinh ||Olivier Lapraye, Zhansaya Yussupova ||
||5 ||[[/05|T-Mafia]] || || ||Hasan Iqbal ||Wahidul Alam, Nina Alef ||
+||4 ||[[/04|WeDo]] || || ||Annabelle Trinh ||Olivier Lapraye, Zhansaya Yussupova, Tino Xaver Schlosser ||
||5 ||[[/05|T-Mafia]] || || ||Hasan Iqbal ||Wahidul Alam, Nina Alef, 赛义德 ||

---- /!\ '''Edit conflict - your version:''' ----
||1 ||[[/01|Vision]]|| || ||Violynne Wang ||Johannes Schwarz, Xia Anbang, Harshnika ||
||2 ||[[/02|Hapdevs]] || ||All hail Leader! ||Leo Thevenet ||Sajjad Kamali siahroudi, Pouneh Soleimaninejadian, Kovtun Valery ||
||3 ||[[/03|Shaman]] || ||Healthcare in your pocket. ||Niklas Stoehr ||Daniel Swaab, Thiago de Sousa Silveira, Seth Schmitz ||
||4 ||[[/04|WeDo]] || ||You dream, WeDo. ||Annabelle Trinh ||Olivier Lapraye, Zhansaya Yussupova, Tino Xaver Schlosser ||
||5 ||[[/05|T-Mafia]] || ||You never walk alone. ||Hasan Iqbal ||Wahidul Alam, Nina Alef, 赛义德 ||

---- /!\ '''End of edit conflict''' ----

Diff for "SpmEng/2016/Groups"

The Groups