xiugai

application/common/versionsql/Version2

@@ -1,12 +1,3 @@
-<<<<<<< HEAD
 ALTER  TABLE  `images`  ADD  ( remote_url varchar(100), status  int(11) default 2, local_url varchar(255));
 ALTER  TABLE  `exams`   ADD  ext  json;
-=======
-ALTER  TABLE  `images`  ADD  (
-    remote_url varchar(100),
-    status  int(11) default 2,
-    local_url varchar(255)
-)
-ALTER  TABLE  `exams`  ADD  ext  json;
->>>>>>> 1db48be2069c8883d0cadd47b0ac6d38a69b7b71
 ALTER  TABLE  `images`  ADD  INDEX image_status (  `status`  );