- conflict marker
- маркер конфликтов (символ, отмечающий конфликтующие изменения файла для упрощения процедуры разрешения конфликта)
Большой англо-русский и русско-английский словарь. 2001.
conflict marker
Смотреть что такое "conflict marker" в других словарях:
Jamsheed Marker — Jamsheed Kekobad Ardeshir Marker, HI, (b: 1922) is a veteran Pakistani diplomat. Reportedly, he is listed in the Guinness Book of Records as having been ambassador to more countries than any other person .citation|last=Martin|first=Susan… … Wikipedia
Ōnin War — Marker at location of outbreak of the Ōnin War The Ōnin War (応仁の乱, Ōnin no Ran?) was … Wikipedia
Battle of Frenchtown — Part of the War of 1812 The River Raisin National Battlefield Park in J … Wikipedia
Effects of global warming — This article is about (primarily) effects during the 21st century. For longer term effects, see Long term effects of global warming. The variou … Wikipedia
Indonesian occupation of East Timor — East Timor is located at the end of the Indonesian archipelago, 400 miles (640km) northwest of Darwin, Australia. History of East Timor … Wikipedia
Toledo War — Map of the Toledo Strip , the disputed region Date 1835–1836 Location … Wikipedia
Group (sociology) — In sociology, a group can be defined as two or more humans that interact with one another, accept expectations and obligations as members of the group, and share a common identity. By this definition, society can be viewed as a large group,… … Wikipedia
linguistics — /ling gwis tiks/, n. (used with a sing. v.) the science of language, including phonetics, phonology, morphology, syntax, semantics, pragmatics, and historical linguistics. [1850 55; see LINGUISTIC, ICS] * * * Study of the nature and structure of… … Universalium
Colfax massacre — Further information: Ulysses S. Grant presidential administration Gathering the dead after the Colfax massacre in Harper s Weekly, May 10, 1873 … Wikipedia
Military history of Asian Americans — Asian Americans have fought on behalf of the United States since the War of 1812 until today. Due to the small population of Asian Americans in the 19th Century their contributions were not heavily recorded. In the 20th Century as the population… … Wikipedia
Palestinian people — Palestinians (الفلسطينيون al Filasṭīniyyūn) Tawfiq Canaan • … Wikipedia
