File tree Expand file tree Collapse file tree 1 file changed +1
-5
lines changed
internal-packages/database/prisma Expand file tree Collapse file tree 1 file changed +1
-5
lines changed Original file line number Diff line number Diff line change @@ -419,12 +419,8 @@ model Project {
419419 onboardingData Json ?
420420 taskScheduleInstances TaskScheduleInstance []
421421 metricsDashboards MetricsDashboard []
422- <<<<<<< ours
423422 llmModels LlmModel []
424- ||||||| ancestor
425- =======
426423 errorGroupStates ErrorGroupState []
427- >>>>>>> theirs
428424}
429425
430426enum ProjectVersion {
@@ -2689,7 +2685,7 @@ model ErrorGroupState {
26892685
26902686 /// Total occurrence count at the time the error was ignored (from ClickHouse).
26912687 /// Used with ignoredUntilTotalOccurrences to compute occurrences since ignoring.
2692- ignoredAtOccurrenceCount BigInt ?
2688+ ignoredAtOccurrenceCount BigInt ?
26932689
26942690 /**
26952691 * Error was ignored at this date
You can’t perform that action at this time.
0 commit comments