diff options
Diffstat (limited to 'video.info')
| -rw-r--r-- | video.info | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 |