remove conflict data

Browse Source

...

This commit is contained in:

phyusin

2018-07-09 10:12:06 +06:30

parent a60f80a874

commit 96d539f141

1 changed files with 982 additions and 1063 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2045

app/views/origami/home/show.html.erb

File diff suppressed because it is too large Load Diff