com web/pres2: Removed files that really belong (and are) in the presentations repository. Having the files here causes conflicts: presentations/joburg14.xml presentations/slides/intro/201 4_title.xml

Commit:    55d26f280a9c794db24e065849a65db319a30ea4
Author:    Derick Rethans <[email protected]>         Wed, 21 Jan 2015 10:24:22 +0000
Parents:   a022b928bdba43093813b336fc973d5c0a8845a0
Branches:  master

Link:       http://git.php.net/?p=web/pres2.git;a=commitdiff;h=55d26f280a9c794db24e065849a65db319a30ea4

Log:
Removed files that really belong (and are) in the presentations repository. Having the files here causes conflicts

Changed paths:
  D  presentations/joburg14.xml
  D  presentations/slides/intro/2014_title.xml


Diff:
diff --git a/presentations/joburg14.xml b/presentations/joburg14.xml
deleted file mode 100644
index 4e322a7..0000000
--- a/presentations/joburg14.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<presentation 
-    template="simple" 
-    navmode="html"
-    titlecolor="#000000"
-    navbarbackground="#bbbbbb"
-    navbartopiclinks="0"
-    logo1="images/php-med-trans.png"
-    titlesize="6em"
-    navbarheight="3.5em"
-    examplebackground="#ffffff"
-    outputbackground="#ffffff"
-    exampleclass="noshadow"
-    exampleoutputclass="noshadow"
->
-
-<topic>PHP</topic>
-<title>PHP</title>
-<event>PHP Craft</event>
-<location>Johannesburg</location>
-<date>Apr.4, 2014</date>
-<speaker>Rasmus Lerdorf</speaker>
-<url>http://talks.php.net/joburg14</url>
-<twitter>@rasmus</twitter>
-
-<slide>slides/intro/titlepage.xml</slide>
-
-<slide>slides/intro/nold.xml</slide>
-<slide>slides/intro/nold2.xml</slide>
-<slide>slides/intro/nold3.xml</slide>
-<slide>slides/intro/eco.xml</slide>
-<slide>slides/intro/wwht2.xml</slide>
-<slide>slides/intro/wwht1.xml</slide>
-
-<slide>slides/intro/2014_title.xml</slide>
-
-<slide>slides/intro/php55.xml</slide>
-<slide>slides/intro/php56.xml</slide>
-
-<slide>slides/intro/atomic1.xml</slide>
-<slide>slides/intro/atomic3a.xml</slide>
-<slide>slides/intro/atomic2.xml</slide>
-<slide>slides/intro/atomic3b.xml</slide>
-<slide>slides/intro/atomic3c.xml</slide>
-<slide>slides/intro/atomic3.xml</slide>
-<slide>slides/intro/atomic4.xml</slide>
-<slide>slides/intro/codeascraft.xml</slide>
-
-<slide>slides/intro/lovehack.xml</slide>
-<slide>slides/intro/greenland0.xml</slide>
-<slide>slides/intro/greenland1.xml</slide>
-<slide>slides/intro/greenland2.xml</slide>
-<slide>slides/intro/greenland3.xml</slide>
-
-<slide>slides/intro/matter.xml</slide>
-<slide>slides/intro/matter2.xml</slide>
-<slide>slides/intro/etsy_access.xml</slide>
-
-</presentation>
diff --git a/presentations/slides/intro/2014_title.xml b/presentations/slides/intro/2014_title.xml
deleted file mode 100644
index de858cf..0000000
--- a/presentations/slides/intro/2014_title.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<slide title="">
-<break lines="12"/>
-<blurb fontsize="20em" align="center">2014</blurb>
-</slide>