Merge branch 'master' into TEST-fork

test MASTER commit test fork
test fork
2025-06-25 11:59:30 +03:00 · 2025-06-25 11:58:35 +03:00 · 2025-06-25 11:57:17 +03:00
2 changed files with 5 additions and 1 deletions
--- a/src/app/hero-search/hero-search.component.html
+++ b/src/app/hero-search/hero-search.component.html
@ -10,3 +10,5 @@
    </li>
  </ul>
 </div>
+
+<!--a> тест ветки </a-->
--- a/src/app/hero-search/hero-search.component.ts
+++ b/src/app/hero-search/hero-search.component.ts
@ -1,3 +1,5 @@
+//test fork
+
 import { Component, OnInit } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import {
Author	SHA1	Message	Date
Костя	2b5bee5a49	Merge branch 'master' into TEST-fork	2025-06-25 11:59:30 +03:00
Костя	4e70ada409	test MASTER commit test fork	2025-06-25 11:58:35 +03:00
Костя	0a03162b96	test fork	2025-06-25 11:57:17 +03:00