diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
commit | f3c395c56a644d976aa9a5608300557600bc683e (patch) | |
tree | 83cb961a721fa8c50903c70bb08ae14dd15ca58c /test/fixtures/servers.yml | |
parent | 7575d8cc70a28b323db0486ed06ab8af33b1f21a (diff) | |
parent | f85943114dba527a1f87abb03229553472f57c0c (diff) |
solved merge conflicts
Diffstat (limited to 'test/fixtures/servers.yml')
-rw-r--r-- | test/fixtures/servers.yml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/fixtures/servers.yml b/test/fixtures/servers.yml index 937a0c0..3001059 100644 --- a/test/fixtures/servers.yml +++ b/test/fixtures/servers.yml @@ -1,11 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -# This model initially had no columns defined. If you add columns to the -# model remove the '{}' from the fixture names and add the columns immediately -# below each fixture, per the syntax in the comments below -# -one: {} -# column: value -# -two: {} -# column: value +one: + default_user_permissions: 1 + +two: + default_user_permissions: 1 |