Merge branch 'master' of http://git.vdk2ch.ru:3000/RakVhalate/Angular_App into master

test merging
2022-10-21 00:57:45 +10:00 · 2022-10-21 00:03:13 +10:00
1 changed files with 7 additions and 0 deletions
--- a/src/app/about/about.component.ts
+++ b/src/app/about/about.component.ts
@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+            // двач лучший двач
 import { ApiChatService } from '../api-chat.service';

@Component({
@ -7,8 +8,14 @@ import { ApiChatService } from '../api-chat.service';
   width="560" height="315" frameborder="0" allowfullscreen></iframe>`
 })
 export class AboutComponent implements OnInit {
+// это комментарий

  ngOnInit(): void {
+
+
+    console.log('ya tochno ne ta stroka chto budet v drugom commite!');
  }

 }
+
+// продам гараж
Author	SHA1	Message	Date
Simple_Not	a63fe1fc6a	Merge branch 'master' of http://git.vdk2ch.ru:3000/RakVhalate/Angular_App into master Some checks failed continuous-integration/drone/push Build is failing Details	2022-10-21 00:57:45 +10:00
Simple_Not	b4b24dda3e	test merging Some checks failed continuous-integration/drone/push Build is failing Details	2022-10-21 00:03:13 +10:00