Merge branch 'newbranch2' of https://git.workbench.lanit.ru/nikitadr/GitTask into newbranch2

creating file.sml and secondfile.txt
adding a line
2026-05-21 17:19:32 +04:00 · 2026-05-21 17:14:20 +04:00 · 2026-05-21 17:06:24 +04:00 · 2026-05-21 16:53:56 +04:00 · 2026-05-21 16:34:30 +04:00 · 2026-05-21 16:22:46 +04:00
2 changed files with 2 additions and 1 deletions
--- a/some.txt
+++ b/some.txt
--- a/some.xml
+++ b/some.xml
@ -1,4 +1,5 @@
 <httpSample t="408" it="0" lt="408" ct="0" ts="1662008561667" s="false" lb="&gt;_/api/usercat/front/product/listing" rc="200" rm="OK" tn="FFAag-ThreadStarter 2-1" dt="text" by="777" sby="963" ng="1" na="2" hn="TEMP-01">
+    <newLine>some new line</newLine>
    <responseHeader class="java.lang.String">HTTP/1.1 200 OK
        Server: nginx
        Date: Thu, 01 Sep 2022 05:02:42 GMT
@ -17,7 +18,7 @@
        Sec-Fetch-Site: same-origin
        Accept-Language: ru-RU,ru;q=0.9
        Accept: application/json, text/plain, */*
-        Content-Length: 180
+        Content-Length: 200
    </requestHeader>
    <method class="java.lang.String">POST</method>
 </httpSample>
Author	SHA1	Message	Date
nikitadr	2283db3aaf	Merge branch 'newbranch2' of https://git.workbench.lanit.ru/nikitadr/GitTask into newbranch2	2026-05-21 17:19:32 +04:00
nikitadr	0b7f317cad	creating file.sml and secondfile.txt	2026-05-21 17:14:20 +04:00
nikitadr	e401972efc	adding a line	2026-05-21 17:06:24 +04:00
nikitadr	e510930154	conflict resolution	2026-05-21 16:53:56 +04:00
nikitadr	840e7d5fe1	newbranch1 changing firstfile.xml	2026-05-21 16:34:30 +04:00
nikitadr	ebe8e24e71	creating firstfile.txt	2026-05-21 16:22:46 +04:00