fixed conflict

2015-09-24 15:51:16 -04:00 · 2015-09-24 15:51:16 -04:00 · e5a6889253
parent 939bdc90ef 5ca00c2ef5
commit e5a6889253
1 changed files with 0 additions and 1 deletions
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@ -68,7 +68,6 @@ if ( ZM_OPT_USE_AUTH && ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST[

 if ( !empty($action) )
 {
-	// if true, a popup will display after login

    	// PP - lets validate reCaptcha if it exists
 	if  (   defined('ZM_OPT_USE_GOOG_RECAPTCHA')