Didio was apparently asked a while back and replied it's still in continutiy just modified to add Wonder Woman.
An answer which means all of nothing.
What REALLY matters is: is Geoff Johns going to write a lot of flashbacks showing Black Canary wasn't there and things happened completely differently from what Waid wrote, or is someone else going to beat him to the punch and write a lot of flashbacks that back Waid's take up?
Who's going to push their agenda hardest? That's all it comes down to,