Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Riggs2018-04-02 20:34:15 +0000
committerSimon Riggs2018-04-02 20:34:15 +0000
commit7cf8a5c302735d193dcf901b87e03e324903c632 (patch)
tree0f9815ae865d08f20e7037c148c3078fad0138e7 /doc/src/sgml/reference.sgml
parent354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb (diff)
Revert "Modified files for MERGE"
This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
Diffstat (limited to 'doc/src/sgml/reference.sgml')
-rw-r--r--doc/src/sgml/reference.sgml1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index ef2270c4673..d27fb414f7c 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -186,7 +186,6 @@
&listen;
&load;
&lock;
- &merge;
&move;
&notify;
&prepare;