From df8fdd66b71abeb203890f864ba931627467d970 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sat, 23 Jan 2016 16:00:36 +0000
Subject: [PATCH] Fix previous merge bundler in packages/yasnippet/doc dir

---
 packages/yasnippet/doc/{doc => }/.nosearch                | 0
 packages/yasnippet/doc/{doc => }/faq.org                  | 0
 packages/yasnippet/doc/{doc => }/index.org                | 0
 packages/yasnippet/doc/{doc => }/nav-menu.html.inc        | 0
 packages/yasnippet/doc/{doc => }/org-setup.inc            | 0
 packages/yasnippet/doc/{doc => }/snippet-development.org  | 0
 packages/yasnippet/doc/{doc => }/snippet-expansion.org    | 0
 packages/yasnippet/doc/{doc => }/snippet-menu.org         | 0
 packages/yasnippet/doc/{doc => }/snippet-organization.org | 0
 packages/yasnippet/doc/{doc => }/snippet-reference.org    | 0
 packages/yasnippet/doc/{doc => }/stylesheets/manual.css   | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/yasnippet/doc/{doc => }/.nosearch (100%)
 rename packages/yasnippet/doc/{doc => }/faq.org (100%)
 rename packages/yasnippet/doc/{doc => }/index.org (100%)
 rename packages/yasnippet/doc/{doc => }/nav-menu.html.inc (100%)
 rename packages/yasnippet/doc/{doc => }/org-setup.inc (100%)
 rename packages/yasnippet/doc/{doc => }/snippet-development.org (100%)
 rename packages/yasnippet/doc/{doc => }/snippet-expansion.org (100%)
 rename packages/yasnippet/doc/{doc => }/snippet-menu.org (100%)
 rename packages/yasnippet/doc/{doc => }/snippet-organization.org (100%)
 rename packages/yasnippet/doc/{doc => }/snippet-reference.org (100%)
 rename packages/yasnippet/doc/{doc => }/stylesheets/manual.css (100%)

diff --git a/packages/yasnippet/doc/doc/.nosearch b/packages/yasnippet/doc/.nosearch
similarity index 100%
rename from packages/yasnippet/doc/doc/.nosearch
rename to packages/yasnippet/doc/.nosearch
diff --git a/packages/yasnippet/doc/doc/faq.org b/packages/yasnippet/doc/faq.org
similarity index 100%
rename from packages/yasnippet/doc/doc/faq.org
rename to packages/yasnippet/doc/faq.org
diff --git a/packages/yasnippet/doc/doc/index.org b/packages/yasnippet/doc/index.org
similarity index 100%
rename from packages/yasnippet/doc/doc/index.org
rename to packages/yasnippet/doc/index.org
diff --git a/packages/yasnippet/doc/doc/nav-menu.html.inc b/packages/yasnippet/doc/nav-menu.html.inc
similarity index 100%
rename from packages/yasnippet/doc/doc/nav-menu.html.inc
rename to packages/yasnippet/doc/nav-menu.html.inc
diff --git a/packages/yasnippet/doc/doc/org-setup.inc b/packages/yasnippet/doc/org-setup.inc
similarity index 100%
rename from packages/yasnippet/doc/doc/org-setup.inc
rename to packages/yasnippet/doc/org-setup.inc
diff --git a/packages/yasnippet/doc/doc/snippet-development.org b/packages/yasnippet/doc/snippet-development.org
similarity index 100%
rename from packages/yasnippet/doc/doc/snippet-development.org
rename to packages/yasnippet/doc/snippet-development.org
diff --git a/packages/yasnippet/doc/doc/snippet-expansion.org b/packages/yasnippet/doc/snippet-expansion.org
similarity index 100%
rename from packages/yasnippet/doc/doc/snippet-expansion.org
rename to packages/yasnippet/doc/snippet-expansion.org
diff --git a/packages/yasnippet/doc/doc/snippet-menu.org b/packages/yasnippet/doc/snippet-menu.org
similarity index 100%
rename from packages/yasnippet/doc/doc/snippet-menu.org
rename to packages/yasnippet/doc/snippet-menu.org
diff --git a/packages/yasnippet/doc/doc/snippet-organization.org b/packages/yasnippet/doc/snippet-organization.org
similarity index 100%
rename from packages/yasnippet/doc/doc/snippet-organization.org
rename to packages/yasnippet/doc/snippet-organization.org
diff --git a/packages/yasnippet/doc/doc/snippet-reference.org b/packages/yasnippet/doc/snippet-reference.org
similarity index 100%
rename from packages/yasnippet/doc/doc/snippet-reference.org
rename to packages/yasnippet/doc/snippet-reference.org
diff --git a/packages/yasnippet/doc/doc/stylesheets/manual.css b/packages/yasnippet/doc/stylesheets/manual.css
similarity index 100%
rename from packages/yasnippet/doc/doc/stylesheets/manual.css
rename to packages/yasnippet/doc/stylesheets/manual.css
-- 
2.39.2