[Fusionforge-commits] FusionForge branch master updated. v6.0.2-192-g3640cb0

[Sylvain Beucler]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  3640cb08bb65b2f7226e1f51f46cf25f4a30607a (commit)
      from  228cee058c93b41a5f56e98651e110de9bab9c92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3640cb08bb65b2f7226e1f51f46cf25f4a30607a

commit 3640cb08bb65b2f7226e1f51f46cf25f4a30607a
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Sep 7 10:14:39 2015 +0200

    Fix merge

diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index c27c512..2feabf0 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -124,7 +124,7 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 	}
 
 	
-	public function changeConfig($text) {
+	public function changeConfig($config) {
 		$forge_get_config = RUN_JOB_PATH."/forge_get_config";
 		$config_path = rtrim(`$forge_get_config config_path`);
 		$classname = get_class($this);

-----------------------------------------------------------------------

Summary of changes:
 tests/func/SeleniumForge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge