1#@!#!123s

: / proc / self / root / var / www / html / hindiusa.org / public_html / hindiusa / .git /
Filename : COMMIT_EDITMSG
back
Merge branch 'production' of bitbucket.org:akhaleshkumar/hindiusa into production

# Conflicts:
#	controllers/SchoolsController.php
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch production
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   config/params.php
#	modified:   config/web.php
#	modified:   controllers/BlogsController.php
#	modified:   controllers/EventsController.php
#	modified:   controllers/ImageGalleriesController.php
#	modified:   controllers/NewsController.php
#	modified:   controllers/NoticesController.php
#	modified:   controllers/SchoolsController.php
#	modified:   controllers/SiteController.php
#	modified:   controllers/TeachersController.php
#	modified:   controllers/TestimonialsController.php
#	modified:   controllers/VideoGalleriesController.php
#	modified:   models/Blogs.php
#	modified:   models/Events.php
#	modified:   models/ImageGalleries.php
#	modified:   models/News.php
#	modified:   models/Notices.php
#	modified:   models/Testimonials.php
#	modified:   models/VideoGalleries.php
#	modified:   views/blogs/_form.php
#	modified:   views/blogs/index.php
#	modified:   views/blogs/our-blogs.php
#	modified:   views/blogs/view.php
#	modified:   views/events/_form.php
#	modified:   views/events/index.php
#	modified:   views/events/view.php
#	modified:   views/image-galleries/_form.php
#	modified:   views/image-galleries/index.php
#	modified:   views/image-galleries/photo-gallery.php
#	modified:   views/image-galleries/view.php
#	modified:   views/layouts/school-front.php
#	modified:   views/news/_form.php
#	modified:   views/news/index.php
#	modified:   views/news/our-news.php
#	modified:   views/news/view.php
#	modified:   views/notices/_form.php
#	modified:   views/notices/index.php
#	modified:   views/notices/our-notices.php
#	modified:   views/notices/view.php
#	modified:   views/site/school.php
#	modified:   views/teachers/our-teachers.php
#	modified:   views/testimonials/_form.php
#	modified:   views/testimonials/index.php
#	modified:   views/testimonials/view.php
#	modified:   views/video-galleries/_form.php
#	modified:   views/video-galleries/index.php
#	modified:   views/video-galleries/video-gallery.php
#	modified:   views/video-galleries/view.php
#	modified:   web/css/site.css
#