s3rius/jjtest

feature/shit #1

Open

s3rius wants to merge 2 commits from feature/shit into main

1 changed files with 1 additions and 0 deletions

Showing only changes of commit 1adeadf534 - Show all commits

									
										1

main.py
									
												View File
												
					@@ -3,3 +3,4 @@ print("Conflict!")

					print("Feature 1.1")

					print("Feature 1.1")

					print("A")

					print("A")

					print("F")

					print("F")

					print("C")