From: James M Snell Date: Wed, 26 Aug 2015 01:58:08 +0000 (-0700) Subject: doc: fix bad merge on modules.markdown X-Git-Tag: v4.0.0-rc.1~81 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e8bb62011f0694f218bcd2d9ddaaadeac3e07fc;p=platform%2Fupstream%2Fnodejs.git doc: fix bad merge on modules.markdown My previous commit landed a bad merge on modules.markdown. This fixes it. --- diff --git a/doc/api/modules.markdown b/doc/api/modules.markdown index 6d0466c..712f070 100644 --- a/doc/api/modules.markdown +++ b/doc/api/modules.markdown @@ -120,12 +120,8 @@ plan accordingly. Node.js has several modules compiled into the binary. These modules are described in greater detail elsewhere in this documentation. -<<<<<<< HEAD -The core modules are defined in Node.js's source in the `lib/` folder. -======= -The core modules are defined within io.js's source and are located in the +The core modules are defined within Node.js's source and are located in the `lib/` folder. ->>>>>>> doc: small clarifications to modules.markdown Core modules are always preferentially loaded if their identifier is passed to `require()`. For instance, `require('http')` will always @@ -135,14 +131,9 @@ return the built in HTTP module, even if there is a file by that name. -<<<<<<< HEAD If the exact filename is not found, then Node.js will attempt to load the -required filename with the added extension of `.js`, `.json`, and then `.node`. -======= -If the exact filename is not found, then io.js will attempt to load the required filename with the added extensions: `.js`, `.json`, and finally `.node`. ->>>>>>> doc: small clarifications to modules.markdown `.js` files are interpreted as JavaScript text files, and `.json` files are parsed as JSON text files. `.node` files are interpreted as compiled addon