Open poggy33 opened 2 days ago
(SP: 1)[#54] Tests for Question Editor Component
You need to resolve the conflicts: ~ git checkout develop ~ git pull ~ git checkout "your branch" ~ git merge develop Then you can deside which version to save in code editor. Then push again.
(SP: 1)[#54] Tests for Question Editor Component