Merge branch 'main' into smatchit

* main: update core no message Update core # Conflicts: # core/core.txt
Update core
2025-06-06 15:22:13 +02:00 · 2025-06-06 11:38:52 +02:00 · 2025-06-06 11:36:02 +02:00
4 changed files with 2 additions and 3 deletions
--- a/core/core.txt
+++ b/core/core.txt
@@ -0,0 +1 @@
+core v2
--- a/tribes/company1/company1.txt
+++ b/tribes/company1/company1.txt
@@ -1 +0,0 @@
-company1 file
--- a/tribes/company2/company2.txt
+++ b/tribes/company2/company2.txt
@@ -1 +0,0 @@
-company2 update
--- a/tribes/core/core.txt
+++ b/tribes/core/core.txt
@@ -1 +1 @@
-core v4
+core v3
Author	SHA1	Message	Date
Jerome Lachaud	22edca840e	Merge branch 'main' into smatchit * main: update core no message Update core # Conflicts: # core/core.txt	2025-06-06 15:22:13 +02:00
Jerome Lachaud	d8ad729f40	Update core	2025-06-06 11:38:52 +02:00
Jerome Lachaud	7da37b06f3	remove non-smatchit	2025-06-06 11:36:02 +02:00