saurabhbhatia f8ad13a9f5 Import Data, Sync Data ... Conflicts: vendor/built_in_modules/personal_book/app/models/writing_book.rb vendor/built_in_modules/personal_conference/app/models/writing_conference.rb vendor/built_in_modules/personal_journal/app/models/writing_journal.rb		2013-11-15 17:36:35 +08:00
..
get_announcement_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
get_book_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
get_conference_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
get_journal_paper_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
get_page_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
get_teacher_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
sync_book_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
sync_conference_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00
sync_journal_paper_data.html.erb	Import Data, Sync Data	2013-11-15 17:36:35 +08:00