search

OWASP / ZSC

OWASP ZSC - Shellcode/Obfuscate Code Generator https://www.secologist.com/
https://www.secologist.com/
Other
648 stars 217 forks source link

Removed merge conflict markers due to #37 pull request #38

Closed paraschetal closed 8 years ago

paraschetal commented 8 years ago

Small change for installer.py to work.

Pratik151 commented 8 years ago

Hello @paraschetal

You will need to remove this line. You can see that conflict is for that line so you need to remove one of the two lines. You can see more about merge conflicts here. In current installer.py remove line 52-55 and 57.

Regards, Pratik Patel

paraschetal commented 8 years ago

thanks @Pratik151 I thought that both the error messages have to be displayed, so I kept them as such. Now I've removed the older message.

Pratik151 commented 8 years ago

@paraschetal I think you removed wrong line in your latest commit. You need to have this line

paraschetal commented 8 years ago

thanks a lot @Pratik151. I hope it's right now.

Ali-Razmjoo commented 8 years ago

Thanks for fixation.