Commit 2a023bf
doc: removed old git conflict markers from fs.md
"doc/api/fs.md" file had some conflict markers like "<<<<<<< HEAD"
that are visible at the bottom of https://nodejs.org/api/fs.html
PR-URL: #7590
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>1 parent f7651d2 commit 2a023bf
1 file changed
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1963,12 +1963,9 @@ The following constants are meant for use with the [`fs.Stats`][] object's | |||
| 1963 | 1963 | [Writable Stream]: stream.html#stream_class_stream_writable | |
| 1964 | 1964 | [inode]: http://www.linux.org/threads/intro-to-inodes.4130 | |
| 1965 | 1965 | [FS Constants]: #fs_fs_constants | |
| 1966 | - <<<<<<< HEAD | ||
| 1967 | 1966 | [`inotify`]: http://man7.org/linux/man-pages/man7/inotify.7.html | |
| 1968 | 1967 | [`kqueue`]: https://www.freebsd.org/cgi/man.cgi?kqueue | |
| 1969 | 1968 | [`FSEvents`]: https://developer.apple.com/library/mac/documentation/Darwin/Conceptual/FSEvents_ProgGuide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40005289-CH1-SW1 | |
| 1970 | 1969 | [`event ports`]: http://illumos.org/man/port_create | |
| 1971 | 1970 | [`ReadDirectoryChangesW`]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365465%28v=vs.85%29.aspx | |
| 1972 | 1971 | [`AHAFS`]: https://www.ibm.com/developerworks/aix/library/au-aix_event_infrastructure/ | |
| 1973 | - ======= | ||
| 1974 | - >>>>>>> dcccbfd... src: refactor require('constants') | ||
0 commit comments