Skip to content

Commit dd3dc0a

Browse files
committed
resolve merge
2 parents ad0812d + e0e5203 commit dd3dc0a

File tree

5 files changed

+218
-219
lines changed

5 files changed

+218
-219
lines changed

data/course-revision/2521-22T2.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: CSESoc COMP2521 Revision Practice Problems
33
desc: Practical coding exercises to help you prepare for your COMP2521 22T2 final exam 😄
44
course: COMP2521
5-
offering: 22T2
5+
offering: 22T3
66
---
77

88

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"disqus-react": "1.1.5",
2828
"gray-matter": "4.0.3",
2929
"lodash.debounce": "4.0.8",
30-
"next": "12.3.1",
30+
"next": "12.3.2",
3131
"phosphor-react": "1.4.1",
3232
"react": "18.2.0",
3333
"react-dom": "18.2.0",
@@ -38,7 +38,7 @@
3838
"rehype-code-titles": "1.1.0",
3939
"rehype-highlight": "5.0.2",
4040
"rehype-prism-plus": "1.5.0",
41-
"rehype-slug": "5.0.1",
41+
"rehype-slug": "5.1.0",
4242
"remark-gfm": "3.0.1",
4343
"seamless-scroll-polyfill": "2.2.0",
4444
"smoothscroll-polyfill": "0.4.4",
@@ -51,15 +51,15 @@
5151
"@types/react": "18.0.24",
5252
"@types/react-dom": "18.0.8",
5353
"@types/smoothscroll-polyfill": "0.3.1",
54-
"@typescript-eslint/eslint-plugin": "5.41.0",
55-
"@typescript-eslint/parser": "5.41.0",
54+
"@typescript-eslint/eslint-plugin": "5.42.0",
55+
"@typescript-eslint/parser": "5.42.0",
5656
"contentlayer": "0.2.8",
5757
"eslint": "8.26.0",
58-
"eslint-config-next": "12.3.1",
58+
"eslint-config-next": "12.3.2",
5959
"eslint-config-prettier": "8.5.0",
6060
"eslint-config-standard": "17.0.0",
6161
"eslint-plugin-import": "2.26.0",
62-
"eslint-plugin-n": "15.3.0",
62+
"eslint-plugin-n": "15.4.0",
6363
"eslint-plugin-promise": "6.1.1",
6464
"eslint-plugin-react": "7.31.10",
6565
"globby": "13.1.2",

pages/course-revision/[course_offering]/[exercise]/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ import Link from 'next/link'
1515
import { ArrowDown, ArrowLeft } from 'phosphor-react'
1616
import ArticleLayout from 'components/ArticleLayout'
1717
import { Button } from 'components/Button'
18+
<<<<<<< HEAD
1819
import { useRouter } from 'next/router'
1920
import CourseRevisionSidebar from 'components/course-revision/CourseRevisionSidebar'
2021
import { styled } from '@stitches/react'
2122
import ContentContainer from 'components/course-revision/ContentContainer'
23+
=======
24+
>>>>>>> main
2225

2326
const defaultComponents = {
2427
Image,

pages/course-revision/[course_offering]/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,3 @@ const ExercisesPage = ({
6767
}
6868

6969
export default ExercisesPage
70-

0 commit comments

Comments
 (0)