fix conflict

2026-08-19 04:14:01 +00:00 · 2018-03-30 11:20:08 +08:00
parent 7b45b30e92 f66d46ccbf
commit 489615bdfa
5 changed files with 2 additions and 63 deletions
@@ -1 +1,2 @@
-.htaccess
+.htaccess
+**/logs
@@ -1,3 +0,0 @@
-Time : 13:55:05
-SQLSTATE[HY093]: Invalid parameter number
-Raw SQL : SELECT * FROM users WHERE username= :username  && status = 1 && reset_token= :reset_token
@@ -1,43 +0,0 @@
-Time : 18:02:06
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 18:02:05
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:57:23
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:57:17
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:56:52
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:53:06
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:52:08
-SQLSTATE[42S02]: Base table or view not found: 1146 Table 'izyim.users' doesn't exist
-Raw SQL : SELECT * FROM users WHERE username= :username
-
-Time : 17:51:30
-SQLSTATE[42S02]: Base table or view not found: 1146 Table 'izyim.users' doesn't exist
-Raw SQL : SELECT * FROM users WHERE username= :username
-
-Time : 17:51:20
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:51:00
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:50:53
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:49:08
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:49:08
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
-
-Time : 17:48:56
-SQLSTATE[28000] [1045] Access denied for user 'izyim'@'localhost' (using password: YES)
@@ -1,12 +0,0 @@
-<<<<<<< HEAD
-Time : 14:24:01
-SQLSTATE[HY000] [2002] No connection could be made because the target machine actively refused it.
-
-
-Time : 14:23:57
-SQLSTATE[HY000] [2002] No connection could be made because the target machine actively refused it.
-
-=======
-Time : 18:20:59
-SQLSTATE[HY000] [2002] Can't connect to local MySQL server through socket '/Applications/AMPPS/var/mysql.sock' (2)
->>>>>>> 02ecd69c6a4837c593e20ee8ff82b7bbaf228000
@@ -1,4 +0,0 @@
- <?php
-        $im = file_get_contents('filename.gif');
-        $imdata = base64_encode($im);      
-?>