From f5f35a18125846d6e6ddcf4951e1838bf23a883d Mon Sep 17 00:00:00 2001 From: Mohamed Mujahid Date: Wed, 7 Jul 2010 06:36:24 +0000 Subject: merging changes from DRUPAL-6--4 --- video.info | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'video.info') diff --git a/video.info b/video.info index b4a584b..928b5ac 100644 --- a/video.info +++ b/video.info @@ -6,4 +6,8 @@ package = "Video" dependencies[] = content dependencies[] = filefield core = 6.x -version = 6.x-4.x-dev \ No newline at end of file +<<<<<<< video.info +version = 6.x-4.x-dev +======= +version = 6.x-4.x-dev +>>>>>>> 1.3.4.1.4.1.2.2 -- cgit v1.2.3