Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZODB
Commits
f06ab497
Commit
f06ab497
authored
Jun 25, 2007
by
Gary Poster
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"initialized" not "initiated [into a fraternity]" (thanks Aaron)
parent
3669db78
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
src/ZODB/ConflictResolution.txt
src/ZODB/ConflictResolution.txt
+1
-1
No files found.
src/ZODB/ConflictResolution.txt
View file @
f06ab497
...
...
@@ -171,7 +171,7 @@ Don't change it. You make changes by returning the state. This is
effectively a class method.
DANGERS: The changes you make to the instance will be discarded. The
instance is not initia
t
ed, so other methods that depend on instance
instance is not initia
liz
ed, so other methods that depend on instance
attributes will not work.
Here's an example of a broken _p_resolveConflict method.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment