From d0a51a2b82b163ca8a79f2b50ff13b735e827da4 Mon Sep 17 00:00:00 2001 From: altsang Date: Tue, 17 Sep 2013 16:30:12 -0700 Subject: [PATCH] remove >>>>>> from bad merge --- docs/concepts.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/concepts.md b/docs/concepts.md index 4ec6304b..44f76f12 100644 --- a/docs/concepts.md +++ b/docs/concepts.md @@ -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 fitting your use case to some fixed modelling strategy. The choice is yours. ->>>>>>> 315218c79b59a51b5c3e2d93388ffb65d3510525 ### Models