8 ani în urmă · 7ec605492a
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 
															 # phpstorm project files
														
 
															 .idea
														
 
															+.htaccess
														
 
															+/.idea
														
 
															 # netbeans project files
														
 
															 nbproject
														
--- a/www/protected/config/main.php
+++ b/www/protected/config/main.php
@@ -119,10 +119,6 @@ return array(
 
															     'params'=> array_merge(
														
 
															         array(
														
 
															             "pingxx_api_key" => 'sk_live_jn9WXTSKGq94vDavn5SuPezH',
														
 
															-<<<<<<< HEAD
														
 
															-            "certify_url" => 'http://common.yiguanjia.me/webapp/auth?need_header=0',
														
 
															-=======
														
 
															->>>>>>> 419dd07e284d17327925aa79c03f32afd8f6c9eb
														
 
															             'qiniuConfig' => array(
														
 
															                 'ak'=>'Kn8GNMFOLKTNMUaKZ6r1wnjsgTk4ideQifK3umUr',
														
 
															                 'sk'=>'mLtD4GhBjQt_llcgx4rKlhAts9j8iJ0Qa5VmNyi2',