Merge branch 'development' into asCollection-removal

moosetechnology · Nov 23, 2023 · 392137e · 392137e
2 parents bb38169 + b639f2a
commit 392137e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/famix-config.ston b/.github/workflows/famix-config.ston
@@ -2,8 +2,7 @@ SmalltalkCISpec {
 #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Famix',
-      #directory : '../../src',
-      #onConflict : #useIncoming
+      #directory : '../../src'
     }
   ],
 #postLoading : 'silence-compiler-warnings.st'