website

commit c74bc9dbe7fc1172937b21e39bdfe3360b114bed
parent 0e2dae595efbec805c6ad3df09bee4f083c54678
Author: hrryt <harry@mayesfield.uk>
Date:   Sat,  8 Aug 2026 18:04:27 +0100

Fix questions

Diffstat:
M
src/components/questions/AddingFractionsQuestion.jsx
 | 
2
+-
M
src/components/questions/QuadraticEquationQuestion.jsx
 | 
4
----

2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/components/questions/AddingFractionsQuestion.jsx b/src/components/questions/AddingFractionsQuestion.jsx
@@ -1,5 +1,5 @@
 import Question from '../Question.jsx';
-import { getRandomInt, getHCF } from '/src/scripts/utils.js';
+import { getRandomInt, getHCF } from '../../scripts/utils.js';
 
 function formatFraction(num, denom) {
   if (denom == 1) { return `${num}`; }
diff --git a/src/components/questions/QuadraticEquationQuestion.jsx b/src/components/questions/QuadraticEquationQuestion.jsx
@@ -1,9 +1,5 @@
 import Question from '../Question.jsx';
-<<<<<<< HEAD
 import { getRandomInt, getRandomBoolean, getRandomChoice, formatCoefficient, getHCF } from '../../scripts/utils.js';
-=======
-import { getRandomInt, getRandomBoolean, getRandomChoice, formatNumber } from '/src/scripts/utils.js';
->>>>>>> 7778bc7 (Add cubic graphing component)
 
 function formatQuadraticExpression(a, b, c) {
   const fa = formatCoefficient(a, { showPlus: false, showOne: false, showZero: false, suffix: 'x^2' });