branch: master
commit 9035572425ceae8743537058e3f4b6beb81df333
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
Fix bad git subtree merge for ivy
---
CONTRIBUTING.org => packages/ivy/CONTRIBUTING.org | 0
{targets => packages/ivy/targets}/checkdoc.el | 2 ++
{targets => packages/ivy/targets}/plain.el | 2 ++
targets/obsolete-config.el | 4 ----
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CONTRIBUTING.org b/packages/ivy/CONTRIBUTING.org
similarity index 100%
rename from CONTRIBUTING.org
rename to packages/ivy/CONTRIBUTING.org
diff --git a/targets/checkdoc.el b/packages/ivy/targets/checkdoc.el
similarity index 75%
rename from targets/checkdoc.el
rename to packages/ivy/targets/checkdoc.el
index 3162d36..d49b6bf 100644
--- a/targets/checkdoc.el
+++ b/packages/ivy/targets/checkdoc.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2017 Free Software Foundation, Inc.
+
(checkdoc-file "colir.el")
(checkdoc-file "counsel.el")
(checkdoc-file "ivy-overlay.el")
diff --git a/targets/plain.el b/packages/ivy/targets/plain.el
similarity index 60%
rename from targets/plain.el
rename to packages/ivy/targets/plain.el
index b9b2120..63b83a9 100644
--- a/targets/plain.el
+++ b/packages/ivy/targets/plain.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2017 Free Software Foundation, Inc.
+
(package-initialize)
(ivy-mode)
(counsel-mode)
diff --git a/targets/obsolete-config.el b/targets/obsolete-config.el
deleted file mode 100644
index 8d79b70..0000000
--- a/targets/obsolete-config.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path default-directory)
-(require 'counsel)
-(setq counsel-prompt-function 'counsel-prompt-function-default)
-(byte-compile-file (expand-file-name "targets/obsolete-config.el"))
