Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml  | 
			||
|---|---|---|
| .. | ||
| factories | ||
| helpers | ||
| models | ||
| rcov.opts | ||
| spec_helper.rb | ||
				
					
						
							Conflicts: app/helpers/attribute_fields_helper.rb app/views/admin/infos/_form.html.erb config/locales/zh_tw.yml  | 
			||
|---|---|---|
| .. | ||
| factories | ||
| helpers | ||
| models | ||
| rcov.opts | ||
| spec_helper.rb | ||