Skip to content

Commit

Permalink
merge conflict recovery 1
Browse files Browse the repository at this point in the history
  • Loading branch information
duranb committed Apr 12, 2024
1 parent 7c08b5f commit 804cfc3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/routes/plans/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
$: hasUpdateViewPermission = $view !== null ? featurePermissions.view.canUpdate(data.user, $view) : false;
$: if ($initialPlan) {
hasCheckConstraintsPermission =
featurePermissions.constraintPlanSpec.canCheck(data.user, $initialPlan, $initialPlan.model) && !$planReadOnly;
featurePermissions.constraintsPlanSpec.canCheck(data.user, $initialPlan, $initialPlan.model) && !$planReadOnly;
hasExpandPermission =
featurePermissions.expansionSequences.canExpand(data.user, $initialPlan, $initialPlan.model) && !$planReadOnly;
hasScheduleAnalysisPermission =
Expand Down

0 comments on commit 804cfc3

Please sign in to comment.