From 79b93ddd33ff33584f63121abf76f4f40d449475 Mon Sep 17 00:00:00 2001 From: crcro Date: Sat, 17 Sep 2016 23:42:08 +0300 Subject: [PATCH] fix conflict --- sql-schema/{134.sql => 135.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql-schema/{134.sql => 135.sql} (100%) diff --git a/sql-schema/134.sql b/sql-schema/135.sql similarity index 100% rename from sql-schema/134.sql rename to sql-schema/135.sql