Fixed conflicts introduced in last merge from Vladimir

[clinton/lisp-on-lines.git] / src / packages.lisp

diff --git a/src/packages.lisp b/src/packages.lisp
index afa92f2..0fd0c87 100644 (file)
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -65,8 +65,10 @@
    :edit-instance
    :save-instance
    :cancel-save-instance
-   :global-properties))
-
+   :ensure-instance-sync
+   :global-properties
+   :search-expr
+   :search-query))
 
 (defpackage :lisp-on-lines
-  (:use :mewa :meta-model :common-lisp :it.bese.ucw))
\ No newline at end of file
+  (:use :mewa :meta-model :common-lisp :it.bese.ucw))