Merge branch 'remove-orig-file' into 'master'

Remove .orig file created by merge tool See merge request !1485

Merge branch 'remove-orig-file' into 'master'
Remove .orig file created by merge tool See merge request !1485
5fe12452 · Sean McGivern · 629480d8 · a93401d6 · 629480d8
Commit 5fe12452 authored Mar 22, 2017 by Sean McGivern
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 395 deletions

config/routes/project.rb.orig config/routes/project.rb.orig +0 -395

No files found.
--- a/config/routes/project.rb.orig
+++ b/config/routes/project.rb.orig