Dakshesh Jain 5224b3da88 fixed merge conflict

2022-12-02 17:23:11 +05:30

..

components

fixed merge conflict

2022-12-02 17:23:11 +05:30

configuration

…

constants

fixed merge conflict

2022-12-02 17:23:11 +05:30

contexts

…

layouts

…

lib

fixed merge conflict

2022-12-02 17:23:11 +05:30

pages

fixed merge conflict

2022-12-02 17:23:11 +05:30

public

…

styles

…

types

fixed merge conflict

2022-12-02 17:23:11 +05:30

ui

…

.prettierrc

…

google.d.ts

…

next-env.d.ts

…

next.config.js

…

package.json

…

postcss.config.js

…

tailwind.config.js

…

tsconfig.json

…

yarn.lock

…