cvs: phpweb /archive 2008.xml
| From: | Hannes Magnusson | Date: | Mon, 17 Nov 2008 17:00:05 +0000 |
| Subject: | cvs: phpweb /archive 2008.xml | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-3081@lists.php.net to get a copy of this message | ||
bjori Mon Nov 17 17:00:05 2008 UTC
Modified files:
/phpweb/archive 2008.xml
Log:
Remove conflict marker
http://cvs.php.net/viewvc.cgi/phpweb/archive/2008.xml?r1=1.67&r2=1.68&diff_format=u
Index: phpweb/archive/2008.xml
diff -u phpweb/archive/2008.xml:1.67 phpweb/archive/2008.xml:1.68
--- phpweb/archive/2008.xml:1.67 Mon Nov 17 14:11:09 2008
+++ phpweb/archive/2008.xml Mon Nov 17 17:00:05 2008
@@ -109,7 +109,6 @@
</content>
</entry>
<entry>
->>>>>>> 1.66
<title>PHP Quebec 2009</title>
<id>http://www.php.net/archive/2008.php#id2008-09-16-1</id>
<published>2008-09-16T10:12:12+02:00</published>