From: harry Date: Wed, 17 May 2017 15:27:53 +0000 (+0530) Subject: Try to resolve conflict - docs/pages/index.md X-Git-Tag: v6.4.0-rc1~23^2~20^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5db18e94a1aa121b052c1ededa3d6ee3764a9e9;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Try to resolve conflict - docs/pages/index.md --- diff --git a/docs/pages/index.md b/docs/pages/index.md index 5a19c6093..5813ddcd1 100644 --- a/docs/pages/index.md +++ b/docs/pages/index.md @@ -56,29 +56,17 @@ Get to know the pieces of Foundation. Media Queries

Working with Foundation's breakpoints.

-
- Prototyping Utilities -

Quickly create Prototypes from simple sketches and mockups.

-
-
- JavaScript Utilities -

Use our easy to use and super helpful Utility Libraries

-
Flexbox Mode

Supercharge your CSS with flexbox.

-
- Kitchen Sink -

Every component on one page.

-
Compatibility

What browsers does Foundation work with?

-
- Starter Projects -

Templates that give you a solid foundation to start with.

+