@@ -183,12 +183,8 @@ def eval_path(self, path, evaluation, options):
183183
184184class Character (Builtin ):
185185 """
186- <<<<<<< HEAD
187186 <url>:WMA link:
188187 https://reference.wolfram.com/language/ref/Character.html</url>
189- =======
190- <url>:WMA link:https://reference.wolfram.com/language/ref/Character.html</url>
191- >>>>>>> f6040b82 (docstr url for files_io, intfns, list and trace)
192188
193189 <dl>
194190 <dt>'Character'
@@ -486,13 +482,9 @@ def eval_default(self, filename, evaluation):
486482
487483class InputFileName_ (Predefined ):
488484 """
489- <<<<<<< HEAD
490485 <url>
491486 :WMA link:
492487 https://reference.wolfram.com/language/ref/$InputFileName.html</url>
493- =======
494- <url>:WMA link:https://reference.wolfram.com/language/ref/$InputFileName.html</url>
495- >>>>>>> f6040b82 (docstr url for files_io, intfns, list and trace)
496488
497489 <dl>
498490 <dt>'$InputFileName'
@@ -534,13 +526,9 @@ class InputStream(Builtin):
534526
535527class OpenRead (_OpenAction ):
536528 """
537- <<<<<<< HEAD
538529 <url>
539530 :WMA link:
540531 https://reference.wolfram.com/language/ref/OpenRead.html</url>
541- =======
542- <url>:WMA link:https://reference.wolfram.com/language/ref/OpenRead.html</url>
543- >>>>>>> f6040b82 (docstr url for files_io, intfns, list and trace)
544532
545533 <dl>
546534 <dt>'OpenRead["file"]'
@@ -731,13 +719,9 @@ def eval_default(self, exprs, filename, evaluation):
731719
732720class PutAppend (BinaryOperator ):
733721 """
734- <<<<<<< HEAD
735722 <url>
736723 :WMA link:
737724 https://reference.wolfram.com/language/ref/PutAppend.html</url>
738- =======
739- <url>:WMA link:https://reference.wolfram.com/language/ref/PutAppend.html</url>
740- >>>>>>> f6040b82 (docstr url for files_io, intfns, list and trace)
741725
742726 <dl>
743727 <dt>'$expr$ >>> $filename$'
0 commit comments