Skip to content

Commit 2a023bf

Browse files
jjhidalgarevanlucas
authored andcommitted
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

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

doc/api/fs.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,12 +1963,9 @@ The following constants are meant for use with the [`fs.Stats`][] object's
19631963
[Writable Stream]: stream.html#stream_class_stream_writable
19641964
[inode]: http://www.linux.org/threads/intro-to-inodes.4130
19651965
[FS Constants]: #fs_fs_constants
1966-
<<<<<<< HEAD
19671966
[`inotify`]: http://man7.org/linux/man-pages/man7/inotify.7.html
19681967
[`kqueue`]: https://www.freebsd.org/cgi/man.cgi?kqueue
19691968
[`FSEvents`]: https://developer.apple.com/library/mac/documentation/Darwin/Conceptual/FSEvents_ProgGuide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40005289-CH1-SW1
19701969
[`event ports`]: http://illumos.org/man/port_create
19711970
[`ReadDirectoryChangesW`]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365465%28v=vs.85%29.aspx
19721971
[`AHAFS`]: https://www.ibm.com/developerworks/aix/library/au-aix_event_infrastructure/
1973-
=======
1974-
>>>>>>> dcccbfd... src: refactor require('constants')

0 commit comments

Comments
 (0)