search

mubix / post-exploitation-wiki

Post Exploitation Wiki
MIT License
502 stars 112 forks source link

Variety of edits - Formatting and adding content #44

Closed WebBreacher closed 10 years ago

WebBreacher commented 10 years ago

Standardized blind file format, organized the navigation option for Windows, moved Doku content for Important files.

mubix commented 10 years ago

looks like there is a merge conflict. Did you pull recent before making the edits?

WebBreacher commented 10 years ago

I did not. Suggested best course of action?

On Sun, Nov 10, 2013 at 2:12 PM, Rob Fuller notifications@github.comwrote:

looks like there is a merge conflict. Did you pull recent before making the edits?

— Reply to this email directly or view it on GitHubhttps://github.com/mubix/post-exploitation-wiki/pull/44#issuecomment-28157863 .

WebBreacher commented 10 years ago

Let's disapprove this request and I'll make another.

OJ commented 10 years ago

Just merge from master, fix the conflicts and push again.

mubix commented 10 years ago

Ok, closing this out