zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-21 19:59:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed db/schema merge mishap

Browse source
This commit is contained in:
Andres Keskküla 2014-09-25 15:42:11 +03:00
parent 641522ff08
commit bc49350a4d
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
db/schema.rb
View file

@ -11,11 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20140925073734) do
=======
ActiveRecord::Schema.define(version: 20140925101927) do
>>>>>>> 662806d8c92f67dda55ee91326dfb5f89ddfc230
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"