Skip to content

Commit

Permalink
feat: #41 - resolving conflicting files
Browse files Browse the repository at this point in the history
  • Loading branch information
devasMartins-Tmd committed Jul 22, 2024
1 parent 2661200 commit 54f3f64
Show file tree
Hide file tree
Showing 3 changed files with 261 additions and 20 deletions.
24 changes: 8 additions & 16 deletions app/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import avatar from "../../public/avatar.png";





import avatar from '../../public/avatar.png';

export { date, avatar };

export {default as drop} from '../../public/drop.png';
export {default as icon} from '../../public/icon.png';
export {default as logo} from '../../public/logo.png';
export {default as question} from '../../public/question.png';
export {default as search} from '../../public/search.png';
export {default as menu} from '../../public/menu.png';
export { default as drop } from "../../public/drop.png";
export { default as icon } from "../../public/icon.png";
export { default as logo } from "../../public/logo.png";
export { default as question } from "../../public/question.png";
export { default as search } from "../../public/search.png";
export { default as menu } from "../../public/menu.png";

export { default as avatar } from "../../public/avatar.png";
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"react-dom": "^18.2.0",
"react-email": "^2.1.5",
"react-hook-form": "^7.52.1",
"recharts": "^2.12.7",
"swiper": "^11.1.5",
"tailwind-merge": "^2.4.0",
"tailwindcss-animate": "^1.0.7",
Expand Down Expand Up @@ -76,5 +77,6 @@
},
"engines": {
"node": ">=20.0.0"
}
}
},
"packageManager": "[email protected]+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
}
Loading

0 comments on commit 54f3f64

Please sign in to comment.