fixed conflict

2017-06-06 09:43:16 +06:30
parent faca7295f7 d9f7b391ec
commit 0cc378f318
50 changed files with 331 additions and 106 deletions
--- a/spec/models/test_spec.rb
+++ b/spec/models/test_spec.rb
@@ -1,5 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Test, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
-end