Skip to content

Commit

Permalink
fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
manav1411 committed Sep 11, 2024
2 parents 71a7cf1 + 4600b04 commit b7e2c71
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 32 deletions.
43 changes: 12 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,17 @@
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
## Purpose
1. This is the code for my personal website, accessible at [manavdodia.com](https://manavdodia.com)\
2. This project provides users information about me, and my digital portfolio :)

## Getting Started
## Screenshots
<img width="640" alt="Screenshot 2024-09-06 at 1 28 52 pm" src="https://github.com/user-attachments/assets/a7b85723-c297-4bbc-ba2b-cf973a895764">

First, run the development server:

```bash

## Local setup
to run this project locally, run the following commands:
```
git clone [email protected]:manav1411/Personal-website.git
cd Personal-website
npm i
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
2 changes: 1 addition & 1 deletion src/data/homeExperiencesData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ type Experience = {
},
];

export default experiences;
export default experiences;

0 comments on commit b7e2c71

Please sign in to comment.