From 394c1901e522be0d99915e8af677366856b37497 Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Thu, 21 Mar 2024 18:42:40 +0530 Subject: [PATCH 1/2] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 62ec0208d..f43e205f9 100644 --- a/README.md +++ b/README.md @@ -47,3 +47,5 @@ If you need to lint just one file, you can run: ```sh npx eslint file1.js ``` +## Code merge process +https://github.com/adobecom/cc/wiki From 6e09f6d514d90c115fddf33999abaf05f977bcee Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Thu, 21 Mar 2024 18:43:02 +0530 Subject: [PATCH 2/2] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f43e205f9..b31e06235 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # CC x Milo The Franklin based project for creative cloud pages on www.adobe.com. Based off of milo-college. +## Code merge process +https://github.com/adobecom/cc/wiki + ## Developing 1. Install the [AEM CLI](https://github.com/adobe/helix-cli): `sudo npm install -g @adobe/aem-cli` 2. Run `aem up` this repo's folder. (opens your browser at `http://localhost:3000`) @@ -47,5 +50,3 @@ If you need to lint just one file, you can run: ```sh npx eslint file1.js ``` -## Code merge process -https://github.com/adobecom/cc/wiki