Skip to content
Snippets Groups Projects
Commit cf9cea33 authored by Xingan Zhao's avatar Xingan Zhao
Browse files
This merge integrates changes from the upstream repository into the local branch.
Conflicts were resolved and the branch is now up to date with the latest changes.
parents 87e77fe8 28d77157
No related branches found
No related tags found
No related merge requests found
Pipeline #417250 passed
......@@ -84,7 +84,7 @@ export function Engineering() {
<h2>Section 3</h2>
<p>Content for section 3.</p>
<div className="rounded-border">
<h4 className="center-text">Section 3</h4>
<h4 className="center-text">我是大帅B</h4>
<p className="indent">las ijffs aiskfd fskj iiwls asd.aass ffas awssd awus iisal fask.aisisad ksjdfkaf iwjasifjakdshf wijdfalksjf wiksjkfjksalhf, gsahfjhgejkfh uhaejkfh sjdihgfuqiw jh sjiafhjsaj fh asd.</p>
<p className="indent">las ijffs aiskfd fskj iiwls asd.aass ffas awssd awus iisal fask.aisisad ksjdfkaf iwjasifjakdshf wijdfalksjf wiksjkfjksalhf, gsahfjhgejkfh uhaejkfh sjdihgfuqiw jh sjiafhjsaj fh asd.</p>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment