Fixed James' Merge Conflict Mistake

Localight / LocalightBackend

This will contain the backend of the database for the Backend.

http://localism.github.io/LocalightDocs/#/

0 stars 0 forks source link

Closed julianpoy closed 9 years ago

julianpoy commented 9 years ago

James selected only one branch, instead of merging the two branches together. This brings both sets of changes together.

thebeachdev commented 9 years ago

tested this and it works.