Skip to content

Commit b189637

Browse files
committed
Поправил потерянные merge-конфликты в .bib файле.
1 parent aa946bd commit b189637

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

tex/FormalLanguageConstrainedReachabilityLectureNotes.bib

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,17 +1996,6 @@ @inproceedings{10.1145/2949689.2949711
19961996
}
19971997

19981998
@article{chomsky1958finite,
1999-
<<<<<<< HEAD
2000-
title = {Finite state languages},
2001-
author = {Chomsky, Noam and Miller, George A},
2002-
journal = {Information and control},
2003-
volume = {1},
2004-
number = {2},
2005-
pages = {91--112},
2006-
year = {1958},
2007-
publisher = {Elsevier}
2008-
}
2009-
=======
20101999
title={Finite state languages},
20112000
author={Chomsky, Noam and Miller, George A},
20122001
journal={Information and control},
@@ -2018,4 +2007,3 @@ @article{chomsky1958finite
20182007
}
20192008

20202009
@article{OWENS_REPPY_TURON_2009, title={Regular-expression derivatives re-examined}, volume={19}, DOI={10.1017/S0956796808007090}, number={2}, journal={Journal of Functional Programming}, author={OWENS, SCOTT and REPPY, JOHN and TURON, AARON}, year={2009}, pages={173–190}} <div></div>
2021-
>>>>>>> 2d5d859 ([WIP] Регулярные языки)

0 commit comments

Comments
 (0)