Skip to content

Commit

Permalink
chore: useLoaded for conflict in .smalltalk.ston
Browse files Browse the repository at this point in the history
  • Loading branch information
knowbased committed Aug 19, 2024
1 parent f287614 commit 3fd9c39
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .smalltalk.ston
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SmalltalkCISpec {
#directory : 'src',
#load : [ 'default', 'Jira' ],
#platforms : [ #pharo ],
#onConflict : #useIncoming,
#onConflict : #useLoaded,
#onUpgrade : #useIncoming
}
],
Expand Down

0 comments on commit 3fd9c39

Please sign in to comment.