Unverified Commit 344c520b authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

fix merge

parent 0efabc3f
......@@ -53,11 +53,8 @@ INSTALLED_APPS = [
'mailinglists',
'merchandise',
'thabloid',
<<<<<<< HEAD
'partners',
=======
'events',
>>>>>>> Initial events app
]
MIDDLEWARE = [
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment