Fixing merge conflict code that was stuck in the previous commit - Githubissues

compserv / hknweb

The new HKN website (using Django, hopefully at hkn.eecs.berkeley.edu soon)

https://dev-hkn.eecs.berkeley.edu

MIT License

19 stars 108 forks source link

Fixing merge conflict code that was stuck in the previous commit #563

Closed lo-maxwell closed 9 months ago