summaryrefslogtreecommitdiff
path: root/doc/en/talks.txt
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-07-03 11:47:18 +0200
committerholger krekel <holger@merlinux.eu>2013-07-03 11:47:18 +0200
commitea4a3adfd6fe78df5103b499fb7123433041aa7a (patch)
tree835865d843b3196485ffbfa33f77172548c26f9d /doc/en/talks.txt
parentc4c966683c082aedb461f94b49e1ef73e4346037 (diff)
downloadpytest-ea4a3adfd6fe78df5103b499fb7123433041aa7a.tar.gz
- add my ep2013 talk to talks page
- add "talks/blogs" to the navigation side bar
Diffstat (limited to 'doc/en/talks.txt')
-rw-r--r--doc/en/talks.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/en/talks.txt b/doc/en/talks.txt
index ececdd49d..4d562c30f 100644
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -4,8 +4,6 @@ Talks and Tutorials
.. _`funcargs`: funcargs.html
-.. note:: Upcoming: `professional testing with pytest and tox <`http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig.
-
Tutorial examples and blog postings
---------------------------------------------