A couple of instances of conflict delimiters generated by CVS are embedded in issue.inc, at line 1364 and again at 1385.

I suppose the lines containing node_access() are the correct ones for drupal 4.7.x.

Comments

dww’s picture

Version: 4.7.x-1.5 » 4.7.x-1.x-dev
Assigned: Unassigned » dww
Status: Active » Fixed

Yeah, I noticed. :(

http://drupal.org/cvs?commit=85692

Sorry about that. We should cut a new round of official releases, but that's blocked on the following tasks: http://groups.drupal.org/node/7396

Anonymous’s picture

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.