search

hak5 / nano-tetra-modules

The Official WiFi Pineapple Module Repository for the NANO & TETRA
https://wifipineapple.com/modules
463 stars 143 forks source link

PortalAuth v1.9 #50

Closed sud0nick closed 5 years ago

sud0nick commented 5 years ago

Seb, I'm not sure why the merge conflicts are there. Is it possible for you to just overwrite with the latest I've submitted? It says the conflicts are too complex to resolve in the web editor but I'm not even sure what the conflicts are at the moment.

sud0nick commented 5 years ago

@Foxtrot is it possible to merge and overwrite the conflicts?

foxtrot commented 5 years ago

@sud0nick I cannot solve the merge conflicts for you. You must resolve them yourself over the command line in this PR. Click on the "Use the command line" link and scroll to the bottom to see instructions on how to do that.