confict clear

2017-06-02 19:22:01 +06:30
parent 01fefe3b79 7146a1028a
commit 030d3ffb0f
15 changed files with 264 additions and 253 deletions
--- a/spec/views/origami/request_bills/show.html.erb_spec.rb
+++ b/spec/views/origami/request_bills/show.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "request_bills/show.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end