jgwehr / homelab-docker

Docker Compose for building a home lab
109 stars 15 forks source link

Update branch with #24 #25

Closed jgwehr closed 2 years ago

jgwehr commented 2 years ago

Am I an idiot? Probably. How do I an update a branch with main? This PR wants to resolve conflicts and then save back to main...