Hello

uclaacm · Apr 24, 2024 · c1d6751 · c1d6751
1 parent 8a09626
commit c1d6751
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Want to make a change? Great! Here are the steps:
 3. Implement your code changes for your feature: Beep boop away! Before pushing, make sure that your app builds with 'npm run build', without any errors.
 4. Update your local branch with changes from main branch.
    ```
-   git merge main
+   git merge master
    ```
 5. Once you're ready, stage and commit your changes.
    ```

diff --git a/package-lock.json b/package-lock.json