readme

Author: mike dupont

README.md

@@ -331,8 +331,6 @@ pnpm install --include=optional sharp
 [![Star History Chart](https://api.star-history.com/svg?repos=elizaos/eliza&type=Date)](https://star-history.com/#elizaos/eliza&Date)
 
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 ## notes
 
 ```
@@ -367,12 +365,6 @@ python ./ssh-ssm.py
 `git push origin`
 
 
-
-
-=======
->>>>>>> bbe8a34b2 (readme)
-=======
-
 ## local git
 
 ```
@@ -384,4 +376,3 @@ mkdir -p /opt/git/agent
   chown ubuntu: -R /opt/git/agent/
   history >> hist
 ```
->>>>>>> 633cb51b3 (readme)