git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Nweni
2017-06-28 12:58:27 +06:30
parent f01e1b1ce3 5716294955
commit 55278c83bc
36 changed files with 309 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/cash_mgmt/create.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>CashMgmt#create</h1>
<p>Find me in app/views/cash_mgmt/create.html.erb</p>

2
app/views/origami/cash_mgmt/index.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>CashMgmt#index</h1>
<p>Find me in app/views/cash_mgmt/index.html.erb</p>

2
app/views/origami/cash_mgmt/new.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>CashMgmt#new</h1>
<p>Find me in app/views/cash_mgmt/new.html.erb</p>

2
app/views/origami/shifts/edit.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>Origami::Shifts#edit</h1>
<p>Find me in app/views/origami/shifts/edit.html.erb</p>

2
app/views/origami/shifts/index.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>Origami::Shifts#index</h1>
<p>Find me in app/views/origami/shifts/index.html.erb</p>

2
app/views/origami/shifts/new.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>Origami::Shifts#new</h1>
<p>Find me in app/views/origami/shifts/new.html.erb</p>

2
app/views/origami/shifts/show.html.erb Normal file
View File

@@ -0,0 +1,2 @@
<h1>Origami::Shifts#show</h1>
<p>Find me in app/views/origami/shifts/show.html.erb</p>