From 8cb701ae5ce6ff6ac674a5facd024257945101f5 Mon Sep 17 00:00:00 2001 From: Klimov Paul Date: Wed, 15 Jan 2014 22:45:51 +0200 Subject: [PATCH] Missing "md" extension added for "Using 3rd-Party Libraries" guide part --- .../{using-3rd-party-libraries => using-3rd-party-libraries.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename docs/guide/{using-3rd-party-libraries => using-3rd-party-libraries.md} (99%) diff --git a/docs/guide/using-3rd-party-libraries b/docs/guide/using-3rd-party-libraries.md similarity index 99% rename from docs/guide/using-3rd-party-libraries rename to docs/guide/using-3rd-party-libraries.md index f60f2360ae..c53428756f 100644 --- a/docs/guide/using-3rd-party-libraries +++ b/docs/guide/using-3rd-party-libraries.md @@ -32,7 +32,7 @@ Using Yii2 with Yii1 Yii2 can be used along with Yii1 at the same project. Since Yii2 uses namespaced class names they will not conflict with any class from Yii1. However there is single class, which name is used both in Yii1 and Yii2, it named 'Yii'. -In order to use both Yii1 and Yii2 you need to resolve this collition. +In order to use both Yii1 and Yii2 you need to resolve this collision. To do so you need to define your own 'Yii' class, which will combine content of 'Yii' from 1.x and 'Yii' from 2.x.