Merge branch 'wiki'

test/fixtures/suppliers.yml

@@ -17,6 +17,29 @@
 #  lists         :string(255)
 #
 
+# == Schema Information
+<<<<<<< HEAD:test/fixtures/suppliers.yml
+=======
+# Schema version: 20090325175756
+>>>>>>> wiki:test/fixtures/suppliers.yml
+#
+# Table name: suppliers
+#
+#  id            :integer(4)      not null, primary key
+#  name          :string(255)     not null
+#  address       :string(255)     not null
+#  phone         :string(255)     not null
+#  phone2        :string(255)
+#  fax           :string(255)
+#  email         :string(255)
+#  url           :string(255)
+#  delivery_days :string(255)
+#  note          :string(255)
+#  created_on    :datetime
+#  updated_on    :datetime
+#  lists         :string(255)
+#
+
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 terra:
   name: Terra