Found some conflict markers at settings file.

pinax / pinax-starter-projects

Pinax Starter Projects

MIT License

81 stars 39 forks source link

Found some conflict markers at settings file. #16

Closed theeluwin closed 8 years ago

theeluwin commented 8 years ago

With removing git conflict markers at settings file, I assumed that WIKI_* notations changed to PINAX_WIKI_* due to https://github.com/pinax/pinax-wiki. Migration tested, but actually I found some more bugs in this team-wiki branch. Will keep working on it.

paltman commented 8 years ago

@theeluwin thanks for that!