From: becvalub Date: Wed, 19 Mar 2014 20:11:23 +0000 (+0100) Subject: (no commit message) X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/1f4c949893aae66839815a61431c8faa83a7bb6c --- diff --git a/student/becvalub/index.mdwn b/student/becvalub/index.mdwn index 8b868a34..aa142cb6 100644 --- a/student/becvalub/index.mdwn +++ b/student/becvalub/index.mdwn @@ -13,7 +13,7 @@ Links documenting the results of my work Here, I'll add links similar to the examples below and describe what is being linked. -* [[Example] My communication with developers in a public mailing list archive](http://lists.nongnu.org/archive/html/enigma-devel/2014-03/msg00000.html) +* My communication with developers in a public mailing list archive](http://lists.nongnu.org/archive/html/enigma-devel/2014-03/msg00000.html) * [[Example] Version control repository with the actual state of my work](http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=summary) * [[Example] My commit in the project repository](http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ea90002b0fa7bdee86ec22eba1d951f30bf043a6) * [[Example] Additional supporting material](http://lwn.net/Articles/385586/) @@ -21,7 +21,11 @@ is being linked. Presentation ========== +<<<<<<< HEAD * [[Presentation of the aim of my work in PDF or OpenDocument format (upload it as an *Attachment* to this page)|student/becvalub/prezentace1.pdf]] +======= +* [[Presentation of the aim of my work in PDF or OpenDocument format (upload it as an *Attachment* to this page)|prezentace1.pdf]] +>>>>>>> 16100feef6310a5e94b9fa7ad7f429cdb9632886 * [[Presentation of the results of my work|prezentace2.pdf]] Ohloh @@ -35,3 +39,6 @@ For example: [w]:https://www.ohloh.net/accounts/becvalub/widgets + + +[[project_presentation.pdf]]