search

pwnwiki / pwnwiki.github.io

PwnWiki - The notes section of the pentesters mind.
http://pwnwiki.io
MIT License
552 stars 270 forks source link

Moved duplicate SAM/SYSTEM/registry hives together #76

Closed 0xdevalias closed 10 years ago

0xdevalias commented 10 years ago

There is duplicated data for the SAM/SYSTEM/registry hives in this table, moved them together to make it easier to see the duplication, but this should really be combined/deduplicated.

WebBreacher commented 10 years ago

I'm gonna need @mubix or @glennbarrett to help merge this since it isn't a simple "point and click" resolution and I don't wanna mess up stuff. I did the "checkout via command line" and got this error: "$ git push origin master To git@github.com:pwnwiki/pwnwiki.github.io.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@github.com:pwnwiki/pwnwiki.github.io.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details."

WebBreacher commented 10 years ago

Nevermind @mubix and @glennbarrett ..I tried and think I did it.