search

CodeLanka / ez-net-app

EZ Net is an application developed for rural internet users which are not tech savy and shows interest in the internet and the resources it has.
MIT License
15 stars 29 forks source link

Redux integration #18

Closed nushydude closed 7 years ago

nushydude commented 7 years ago

The main change is Redux integration. Data is still not fetched from an API, but it should be easy to integrate it now.

Also moved the App and DetailPage to src/components. Everything we write should be put inside src.

Made some logical name changes to the Components names and variables.

agentmilindu commented 7 years ago

Awesome job there! Can you resolve the conflicts and push? Then I can merge the PR! :)

nushydude commented 7 years ago

How do I do that? It says the "conflicts are too complex to resolve in the web editor" and as a result, the Resolve conflicts button is greyed out.

I cannot see where the conflicts are. I tried merging the changes to an up-to-date master, but I never got any conflicts.

Is there a way I can "see" the files with merge conflicts, that would be helpful.

agentmilindu commented 7 years ago

Oh, I have somehow missed your last message. I'll fix this.

nushydude commented 7 years ago

Thanks

agentmilindu commented 7 years ago

Hi @nushydude, finally got some time to resolve merge conflicts and merge this! BTW, awesome job.