verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove >>>>>> from bad merge

This commit is contained in:
altsang 2013-09-17 16:30:12 -07:00
parent c136d2995f
commit d0a51a2b82
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/concepts.md
View File

@ -60,7 +60,6 @@ production and ruin everyone's launch day. Stop them before they start!)
Use one strategy, or use both. Leverage them to fit your _use case_, rather than Use one strategy, or use both. Leverage them to fit your _use case_, rather than
fitting your use case to some fixed modelling strategy. The choice is yours. fitting your use case to some fixed modelling strategy. The choice is yours.
>>>>>>> 315218c79b59a51b5c3e2d93388ffb65d3510525
### Models ### Models