[Fusionforge-commits] r11636 - trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/error

Sabri LABBENE labbenes at libremir.placard.fr.eu.org
Fri Nov 26 12:37:12 CET 2010


Author: labbenes
Date: 2010-11-26 12:37:12 +0100 (Fri, 26 Nov 2010)
New Revision: 11636

Modified:
   trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/error/error.json.phtml
Log:
Fix merge conflict.

Modified: trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/error/error.json.phtml
===================================================================
--- trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/error/error.json.phtml	2010-11-26 11:36:54 UTC (rev 11635)
+++ trunk/src/plugins/oslc/include/oslc-zend/application/views/scripts/error/error.json.phtml	2010-11-26 11:37:12 UTC (rev 11636)
@@ -19,4 +19,4 @@
 $json = array("oslc_cm:Error" => array(	"oslc_cm:statusCode"	=> (string)$this->code,
 										"oslc_cm:message"		=> (string)$this->exception->getMessage()));
 
-print str_replace("\/", "/", Zend_Json::prettyPrint(Zend_Json::encode($json)));
\ No newline at end of file
+print str_replace("\/", "/", Zend_Json::prettyPrint(Zend_Json::encode($json)));




More information about the Fusionforge-commits mailing list