diff options
| author | Teddy Wing | 2015-01-25 17:34:05 -0500 |
|---|---|---|
| committer | Teddy Wing | 2015-01-25 17:34:05 -0500 |
| commit | b75ef2c502bf0da050bd290a2ad1cc7aa0dcc408 (patch) | |
| tree | bf3bb8b56a2f289aba5fe0d3467368279a7c87ad /Gemfile.lock | |
| parent | 005e7cca168c6b4eeb06e314046f58b516c13aec (diff) | |
| parent | 28e22a02c8c326df93093644d9de3fa71185ffe4 (diff) | |
| download | Notes-angular-demo-b75ef2c502bf0da050bd290a2ad1cc7aa0dcc408.tar.bz2 | |
Merge branch 'angular-app'
Conflicts:
app/assets/stylesheets/layouts/_global.scss
app/views/home/main.html.erb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8edd449..76920aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,7 +151,6 @@ PLATFORMS DEPENDENCIES byebug - coffee-rails (~> 4.1.0) jbuilder (~> 2.0) jquery-rails rails (= 4.2.0) |