Closed MattWMitchell closed 9 years ago
The branch has conflicts. Make sure you pull the current master branch and fix the conflicts on your end first. Do this by pulling this repos master into your master branch, then merging your module_stream branch into it.
This is my module version of streamline which keeps all modules to be called in the html file streamline_modules.html.