git conflict fix
This commit is contained in:
27
README.md
27
README.md
@@ -1,26 +1,3 @@
|
||||
# README
|
||||
# PMS
|
||||
|
||||
This README would normally document whatever steps are necessary to get the
|
||||
application up and running.
|
||||
|
||||
Things you may want to cover:
|
||||
|
||||
* Ruby version
|
||||
|
||||
* System dependencies
|
||||
|
||||
* Configuration
|
||||
|
||||
* Database creation
|
||||
|
||||
* Database initialization
|
||||
|
||||
* How to run the test suite
|
||||
|
||||
* Services (job queues, cache servers, search engines, etc.)
|
||||
|
||||
* Deployment instructions
|
||||
|
||||
|
||||
# To-Do-Antigravity-
|
||||
Project management tool developed by using antigravity
|
||||
Project Management System
|
||||
|
||||
Reference in New Issue
Block a user