[Pkg-javascript-commits] [node-static] 137/151: Changed order in README and removed merge comment

[Tonnerre Lombard]

This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository node-static.

commit d33d853a00ce948cf46556eaebbd010fa0a5074d
Author: thbaja <thbaja at gmail.com>
Date:   Fri Jun 21 10:28:13 2013 +0200

    Changed order in README and removed merge comment
---
 README.md | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index c681804..21ec0d2 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,24 @@ example: `{ 'X-Hello': 'World!' }`
 
 > defaults to `{}`
 
-<<<<<<< HEAD
+#### `gzip` #
+
+Enable support for sending compressed responses.  This will enable a check for a
+file with the same name plus '.gz' in the same folder.  If the compressed file is
+found and the client has indicated support for gzip file transfer, the contents
+of the .gz file will be sent in place of the uncompressed file along with a
+Content-Encoding: gzip header to inform the client the data has been compressed.
+
+example: `{ gzip: true }`
+example: `{ gzip: /^\/text/ }`
+
+Passing `true` will enable this check for all files.
+Passing a RegExp instance will only enable this check if the content-type of the
+respond would match that RegExp using its test() method.
+
+> Defaults to `false`
+
+
 Command Line Interface
 ----------------------
 
@@ -182,24 +199,3 @@ Command Line Interface
 
     # show help message, including all options
     $ static -h
-=======
-#### `gzip` #
-
-Enable support for sending compressed responses.  This will enable a check for a
-file with the same name plus '.gz' in the same folder.  If the compressed file is
-found and the client has indicated support for gzip file transfer, the contents
-of the .gz file will be sent in place of the uncompressed file along with a
-Content-Encoding: gzip header to inform the client the data has been compressed.
-
-example: `{ gzip: true }`
-example: `{ gzip: /^\/text/ }`
-
-Passing `true` will enable this check for all files.
-Passing a RegExp instance will only enable this check if the content-type of the
-respond would match that RegExp using its test() method.
-
-> Defaults to `false`
-
-
-
->>>>>>> Updated the README to describe gzip configuration

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-static.git