Merge branch 'master' into develop

fluxapps · Mar 10, 2015 · 16b0ecf · 16b0ecf
2 parents cedd426 + b08fc6b
commit 16b0ecf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/classes/class.ilLiveVotingConfigGUI.php b/classes/class.ilLiveVotingConfigGUI.php
@@ -7,7 +7,7 @@
 
 /**
  * Class ilLiveVotingConfigGUI
- * 
+ *
  * @author Fabian Schmid <[email protected]>
  */
 class ilLiveVotingConfigGUI extends ilPluginConfigGUI {
@@ -100,9 +100,9 @@ public function getFields() {
 					),
 				)
 			),
-			/*'use_stresstest' => array(
+			'use_responsive' => array(
 				'type' => 'ilCheckboxInputGUI',
-			),*/
+			),
 		);
 
 		return $this->fields;