Skip to content

Commit 7569178

Browse files
committed
merge fix
1 parent 08fc3b1 commit 7569178

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

my-app/src/presenters/PrerequisitePresenter.jsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ export const PrerequisitePresenter = observer((props) => {
3636
const nodeWidth = 172;
3737
const nodeHeight = 36;
3838

39-
<<<<<<< HEAD
4039
loadTree(props.selectedCourse.code);
41-
=======
42-
loadTree(props.selectedCourse?.code);
43-
>>>>>>> origin/main
4440
console.log(initialNodes);
4541

4642
const getLayoutedElements = (nodes, edges, direction = 'LR') => {
@@ -137,11 +133,7 @@ export const PrerequisitePresenter = observer((props) => {
137133
node["style"]["zIndex"] = 0;
138134
setLabel(node["id"], "More Info...");
139135
}
140-
<<<<<<< HEAD
141136
} else if (node["data"]["label"] !== "One of these" && node["data"]["label"] !== "No Prerequisites" && node["id"] !== props.selectedCourse.code) {
142-
=======
143-
} else if (node["data"]["label"] !== "One of these" && node["data"]["label"] !== "No Prerequisites" && node["id"] !== props.selectedCourse?.code) {
144-
>>>>>>> origin/main
145137
// ADD FUNCTIONALITY FOR CLICKING COURSE CODE NODE (Tu eres muy retrasado y gordo)! :)
146138
// ONCLICK HERE
147139
}

0 commit comments

Comments
 (0)