Skip to content
This repository was archived by the owner on Feb 5, 2022. It is now read-only.

Commit 9aaf986

Browse files
Sam HSam H
authored andcommitted
perf: fix merge conflicts with develop branch
2 parents cf7d81f + 7f0e241 commit 9aaf986

File tree

69 files changed

+3309
-3255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3309
-3255
lines changed

package-lock.json

Lines changed: 2415 additions & 2415 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@openforge/main-website",
33
"private": true,
4-
"version": "2.0.2",
4+
"version": "2.0.3",
55
"description": "The official website for OpenForge",
66
"files": [
77
"dist/"

sass-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ rules:
3535
nesting-depth:
3636
- 1
3737
-
38-
max-depth: 2
38+
max-depth: 5
3939
no-duplicate-properties: 1
4040
no-empty-rulesets: 2
4141
no-debug: 1
@@ -57,4 +57,4 @@ rules:
5757
space-before-colon: 2
5858
space-between-parens: 2
5959
zero-unit:
60-
- 2
60+
- 2

src/assets/about-photo-team.jpg

1.16 MB
Loading

src/assets/i18n/en.ts

Lines changed: 74 additions & 69 deletions
Large diffs are not rendered by default.

src/assets/services-logo-aeris.png

19.4 KB
Loading

src/assets/services-logo-bb.png

3 KB
Loading

src/assets/services-logo-kemin.png

80.9 KB
Loading
11.1 KB
Loading
20 KB
Loading

0 commit comments

Comments
 (0)