# HG changeset patch
# User Samuel Huron <samuel.huron@centrepompidou.fr>
# Date 1292264080 -3600
# Node ID cfc8823f5c9e2f17742edd31e5ee9bf835b9d71d
# Parent  5eec00e4540b4b6a22fe579d3e0f94ff0fd18c6c# Parent  0f961ba9a178be2bfaa3b7073d9abf68d005ac83
Merge

diff -r 5eec00e4540b -r cfc8823f5c9e web/config.php
--- a/web/config.php	Mon Dec 13 19:12:37 2010 +0100
+++ b/web/config.php	Mon Dec 13 19:14:40 2010 +0100
@@ -2,7 +2,6 @@
 
 /**
  * Please edit all for your application registration / other details
- * test
  * 
  */