Merge branch 'main' into Itamar-Oren-N

mirror of https://github.com/ION606/COGMOD-HWI.git synced 2026-05-14 22:16:57 +00:00
mock conflict
2026-05-14 22:16:57 +00:00 · 2025-01-18 15:42:27 +00:00 · 2025-01-18 10:40:05 -05:00 · 2025-01-18 10:38:55 -05:00
1 changed files with 3 additions and 2 deletions
@@ -1,2 +1,3 @@
-this is some text...yippie
-bottom text
+changing on a branch...dooodododooo
+oh no!
+I changed a file!
Author	SHA1	Message	Date
ION606	260b0f4c3b	Merge branch 'main' into Itamar-Oren-N	2025-01-18 15:42:27 +00:00
ION606	41f19a5083	mock conflict	2025-01-18 10:40:05 -05:00
ION606	cdfb268a47	mock conflict	2025-01-18 10:38:55 -05:00