Merge remote-tracking branch 'origin/develop' into develop

MaksymYoung · MaksymYoung · commit 9df3fada85c9 · 2024-11-15T18:18:04.000+02:00
# Conflicts:
#	newfile.txt
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,7 @@
+## Describe your changes
+## Issue ticket number and link
+## Checklist before requesting a review
+ - I have performed a self-review of my code
+ - If it is a core feature, I have added thorough tests
+ - Do we need to implement analytics?
+ - Will this be part of a product update? If yes, please write one phrase about this update
diff --git a/newfile.txt b/newfile.txt
@@ -1 +1 @@
-This is a new file for the develop branch
+Add some changes

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-This is a new file for the develop branch`
	`1`	`+Add some changes`