resolve merge conflict o.O

This commit is contained in:
mngshm
2025-01-21 16:26:33 +05:30

View File

@@ -10,6 +10,12 @@ description:
The getting started instructions mention using `yarn dev` (which is an alias of
`yarn dev:photos`) to serve your web app.
>[!IMPORTANT]
> Please note that Ente's Web App supports the Yarn version 1.22.xx or 1.22.22 specifically.
> Make sure to install the right version or modify your yarn installation to meet the requirements.
> The user might end up into unknown version and dependency related errors if yarn
> is on different version.
```sh
cd ente/web
git submodule update --init --recursive
@@ -157,8 +163,8 @@ npm install pm2@latest
Copy the below contents to a file called `ecosystem.config.js` inside the
`ente/web` directory.
```js
module.exports = {
```js
module.exports = {
apps: [
{
name: "photos",
@@ -174,7 +180,8 @@ Copy the below contents to a file called `ecosystem.config.js` inside the
env: {
NODE_ENV: "development",
PORT: "3001"
},
}
},
{
name: "auth",
script: "yarn workspace auth next dev",