Skip to content

Conversation

ehlewis
Copy link
Contributor

@ehlewis ehlewis commented Feb 8, 2018

Once option 2 is selected the user is prompted whether they want the total number of hosts limited.
The chosen limit is passed to the target function, if the user decided not to have a limit nothing will be passed
If a limit is inputted then that many results are saved to the file.

@NullArray
Copy link
Owner

NullArray commented Feb 14, 2018

Wasn't paying attention and closed the PR. Lol, anyway, there seems to be a conflict, until that is resolved i can't merge this.

@NullArray NullArray closed this Feb 14, 2018
@NullArray NullArray reopened this Feb 14, 2018
@ehlewis
Copy link
Contributor Author

ehlewis commented Feb 14, 2018

Fixed conflicts

@Ekultek
Copy link
Contributor

Ekultek commented Feb 19, 2018

still some conflicts in the trunk, fix them please

@ehlewis
Copy link
Contributor Author

ehlewis commented Feb 20, 2018

Resolved new conflicts

@Ekultek Ekultek requested review from Ekultek and removed request for Ekultek February 20, 2018 01:43
@Ekultek
Copy link
Contributor

Ekultek commented Feb 20, 2018

Looks good to me, @NullArray?

Can you squash it into one for me though?

Second thought we can do it when we merge

@NullArray
Copy link
Owner

Yep, looking good. Thanks for the PR @ehlewis and for reviewing the changes @Ekultek . Approved, and merged.

@NullArray NullArray merged commit 7a7e587 into NullArray:dev-beta Feb 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants