Skip to content

Commit

Permalink
initial
Browse files Browse the repository at this point in the history
  • Loading branch information
corserp committed May 15, 2018
1 parent ba7a961 commit 5812e5f
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# molecule
=======
# Psych

Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/psych`. To experiment with that code, run `bin/console` for an interactive prompt.
# yaml

TODO: Delete this and the text above, and describe your gem
This is a test Gem for YAML

## Installation

Add this line to your application's Gemfile:

```ruby
gem 'psych'
gem 'yaml'
```

And then execute:
Expand All @@ -20,7 +16,7 @@ And then execute:

Or install it yourself as:

$ gem install psych
$ gem install yaml

## Usage

Expand All @@ -41,12 +37,11 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
=======

# gitdb
# yaml
>>>>>>> abeb3f030da8c968ccc42c587512c2741151b8e4
>>>>>>> origin/gitdb
>>>>>>> origin/yaml
=======
>>>>>>> gitdb
>>>>>>> yaml
>>>>>>> 545e91af3f9db9eb5caeecb6e644dab1a15d4349
# gitdb
# psych
# new-role
# yaml

0 comments on commit 5812e5f

Please sign in to comment.