http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&feed=atom&action=history
Team:Aachen/Collaborations/MakerFaire - Revision history
2024-03-29T10:25:28Z
Revision history for this page on the wiki
MediaWiki 1.16.5
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=398233&oldid=prev
Nbailly: /* Representing iGEM and Synthetic Biology at the MakerFaire Hannover */
2014-10-18T03:34:36Z
<p><span class="autocomment">Representing iGEM and Synthetic Biology at the MakerFaire Hannover</span></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 03:34, 18 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 135:</td>
<td colspan="2" class="diff-lineno">Line 135:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></body></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></body></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td></tr>
</table>
Nbailly
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=354526&oldid=prev
StefanReinhold: /* Representing iGEM and Synthetic Biology at the MakerFaire Hannover */
2014-10-17T21:11:16Z
<p><span class="autocomment">Representing iGEM and Synthetic Biology at the MakerFaire Hannover</span></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 21:11, 17 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 24:</td>
<td colspan="2" class="diff-lineno">Line 24:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>When the #NEDCRC soccer game started, we settled for some hamburgers, fermentation broth and exchanged funny stories about our lab experience.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>When the #NEDCRC soccer game started, we settled for some hamburgers, fermentation broth and exchanged funny stories about our lab experience.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>On Saturday, the run on our stand had been so enormous that we had to improvise and print new flyers at our hostel for Sunday, the second and last day of the fair. Just like the day before, a lot of people showed interest in our stand, and especially René passionately demonstrated our devices and informed about synthetic biology as well as our project <del class="diffchange diffchange-inline">"</del>Cellock Holmes<del class="diffchange diffchange-inline">"</del>.</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>On Saturday, the run on our stand had been so enormous that we had to improvise and print new flyers at our hostel for Sunday, the second and last day of the fair. Just like the day before, a lot of people showed interest in our stand, and especially René passionately demonstrated our devices and informed about synthetic biology as well as our project <ins class="diffchange diffchange-inline">''</ins>Cellock Holmes<ins class="diffchange diffchange-inline">''</ins>.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>At about midday, Manuel, advisor of [[Team:Bielefeld-CeBiTec|Team Bielefeld]], visited us and got to experience our measurement device, too.</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>At about midday, Manuel, advisor of [[Team:Bielefeld-CeBiTec|Team Bielefeld]], visited us and got to experience our measurement device, too.</div></td></tr>
</table>
StefanReinhold
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=230831&oldid=prev
Mosthege at 17:06, 14 October 2014
2014-10-14T17:06:16Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 17:06, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 6:</td>
<td colspan="2" class="diff-lineno">Line 6:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>[[File:Aachen_14-10-10_Logo_MakerFaire_with_Border_iNB.png|right|150px]]</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>[[File:Aachen_14-10-10_Logo_MakerFaire_with_Border_iNB.png|right|150px]]</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>= Representing iGEM and Synthetic Biology at the MakerFaire Hannover <del class="diffchange diffchange-inline">2014 </del>=</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>= Representing iGEM and Synthetic Biology at the MakerFaire Hannover =</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>On July 4th-7th, [[User:fgohr|Florian]], [[User:R.hanke|René]] and [[User:mosthege|Michael]] joined [[User:Ansgar|Ansgar]] on a trip to the [http://makerfairehannover.com/ MakerFaire Hannover 2014].</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>On July 4th-7th, [[User:fgohr|Florian]], [[User:R.hanke|René]] and [[User:mosthege|Michael]] joined [[User:Ansgar|Ansgar]] on a trip to the [http://makerfairehannover.com/ MakerFaire Hannover 2014].</div></td></tr>
</table>
Mosthege
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224556&oldid=prev
Pdemling at 09:57, 14 October 2014
2014-10-14T09:57:48Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:57, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>__NOTOC__</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>__NOTOC__</div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"><!--</del>{{Team:Aachen/Header}}<del class="diffchange diffchange-inline">--></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div>{{Team:Aachen/Header}}</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Test/GalleryHeader}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Test/GalleryHeader}}</div></td></tr>
</table>
Pdemling
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224491&oldid=prev
Pdemling at 09:52, 14 October 2014
2014-10-14T09:52:46Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:52, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>__NOTOC__</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>__NOTOC__</div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div>{{Team:Aachen/Header}}</div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline"><!--</ins>{{Team:Aachen/Header<ins class="diffchange diffchange-inline">}}--></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> </div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline">{{Team:Aachen/Test/GalleryHeader</ins>}}</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>[[File:Aachen_14-10-10_Logo_MakerFaire_with_Border_iNB.png|right|150px]]</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>[[File:Aachen_14-10-10_Logo_MakerFaire_with_Border_iNB.png|right|150px]]</div></td></tr>
</table>
Pdemling
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224479&oldid=prev
Pdemling at 09:51, 14 October 2014
2014-10-14T09:51:48Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:51, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 35:</td>
<td colspan="2" class="diff-lineno">Line 35:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><center></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><center></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>'''If you like to see more about our weekend have a look at the following gallery =)'''</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>'''If you like to see more about our weekend have a look at the following gallery =)'''</div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;">{{Team:Aachen/Test/GalleryHeader}}</del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div> </div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><html></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><html></div></td></tr>
</table>
Pdemling
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224380&oldid=prev
Pdemling at 09:43, 14 October 2014
2014-10-14T09:43:55Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:43, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 133:</td>
<td colspan="2" class="diff-lineno">Line 133:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><script src="https://2014.igem.org/Team:Aachen/Scripts/highlight.pack.js?action=raw&ctype=text/javascript"></script></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><script src="https://2014.igem.org/Team:Aachen/Scripts/highlight.pack.js?action=raw&ctype=text/javascript"></script></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><script>hljs.initHighlightingOnLoad();</script></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><script>hljs.initHighlightingOnLoad();</script></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"><pre><code class="python"></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;">if a==42:</del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"> a=5</del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;">else:</del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"> a=4</del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"></code></pre></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></body></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></body></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td></tr>
</table>
Pdemling
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224364&oldid=prev
Pdemling at 09:43, 14 October 2014
2014-10-14T09:43:09Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:43, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 123:</td>
<td colspan="2" class="diff-lineno">Line 123:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><a u=image href="#"><img src="https://static.igem.org/mediawiki/2014/7/75/Aachen_MakerFaire_24.jpg"/></a></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><a u=image href="#"><img src="https://static.igem.org/mediawiki/2014/7/75/Aachen_MakerFaire_24.jpg"/></a></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></div></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></div></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> </div></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <a style="display: none" href="http://www.jssor.com">jquery slider example</a> </ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <div u="navigator" class="jssorb13" style="position: absolute; bottom: 16px; right: 6px;"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> <div u="prototype" style="POSITION: absolute; WIDTH: 21px; HEIGHT: 21px;"></div></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> </div></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> </div></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><link rel="stylesheet" href="https://2014.igem.org/Team:Aachen/Scripts/highlight.pack.default.css?action=raw&ctype=text/css"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><script src="https://2014.igem.org/Team:Aachen/Scripts/highlight.pack.js?action=raw&ctype=text/javascript"></script></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><script>hljs.initHighlightingOnLoad();</script></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"><pre><code class="python"></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">if a==42:</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> a=5</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;">else:</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"> a=4</ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></code></pre></ins></div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins style="color: red; font-weight: bold; text-decoration: none;"></body></ins></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td></tr>
</table>
Pdemling
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224360&oldid=prev
Pdemling at 09:42, 14 October 2014
2014-10-14T09:42:36Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:42, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 123:</td>
<td colspan="2" class="diff-lineno">Line 123:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><a u=image href="#"><img src="https://static.igem.org/mediawiki/2014/7/75/Aachen_MakerFaire_24.jpg"/></a></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div><a u=image href="#"><img src="https://static.igem.org/mediawiki/2014/7/75/Aachen_MakerFaire_24.jpg"/></a></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></div></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"> </del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del style="color: red; font-weight: bold; text-decoration: none;"></body></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td></tr>
</table>
Pdemling
http://2014.igem.org/wiki/index.php?title=Team:Aachen/Collaborations/MakerFaire&diff=224355&oldid=prev
Pdemling at 09:42, 14 October 2014
2014-10-14T09:42:13Z
<p></p>
<table style="background-color: white; color:black;">
<col class='diff-marker' />
<col class='diff-content' />
<col class='diff-marker' />
<col class='diff-content' />
<tr valign='top'>
<td colspan='2' style="background-color: white; color:black;">← Older revision</td>
<td colspan='2' style="background-color: white; color:black;">Revision as of 09:42, 14 October 2014</td>
</tr><tr><td colspan="2" class="diff-lineno">Line 124:</td>
<td colspan="2" class="diff-lineno">Line 124:</td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></div></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></div></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </div></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div> </div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <a style="display: none" href="http://www.jssor.com">jquery slider example</a> </del> </div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <div u="navigator" class="jssorb13" style="position: absolute; bottom: 16px; right: 6px;"></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> <div u="prototype" style="POSITION: absolute; WIDTH: 21px; HEIGHT: 21px;"></div></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </div></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline"> </div></del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></body></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></body></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div></html></div></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td><td class='diff-marker'> </td><td style="background: #eee; color:black; font-size: smaller;"><div>{{Team:Aachen/Footer}}</div></td></tr>
</table>
Pdemling