Merge branch 'develop' of http://31.128.43.79:3000/UNN/2026-rff_mp into develop

[0]
fixed conflict
2026-02-21 14:29:21 +03:00 · 2026-02-21 14:28:51 +03:00 · 2026-02-21 14:28:06 +03:00 · 2026-02-21 14:23:21 +03:00
2 changed files with 10 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,6 +6,10 @@ __pycache__/

 # C extensions
 *.so
+<<<<<<< HEAD
+=======
+
+>>>>>>> a50fd0b ([0])
 .DS_Store
 # Distribution / packaging
 .Python
--- a/sobininaas/429.rtf
+++ b/sobininaas/429.rtf
@ -0,0 +1,6 @@
+{\rtf1\ansi\ansicpg1251\cocoartf2761
+\cocoatextscaling0\cocoaplatform0{\fonttbl}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww11520\viewh8400\viewkind0
+}
Author	SHA1	Message	Date
git_admin	b849e3a7bc	Merge branch 'develop' of http://31.128.43.79:3000/UNN/2026-rff_mp into develop	2026-02-21 14:29:21 +03:00
123	2e0eec1543	[0]	2026-02-21 14:28:51 +03:00
git_admin	17fc44d83e	fixed conflict	2026-02-21 14:28:06 +03:00
123	48d37c6f77	[0] initial commit	2026-02-21 14:23:21 +03:00