guard-jekyll 1.2.0 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -12,7 +12,7 @@ module Guard
12
12
  :config => ['_config.yml'],
13
13
  }
14
14
 
15
- super(watchers, options.merge(defaults))
15
+ super(watchers, defaults.merge(options))
16
16
  end
17
17
 
18
18
  def start
@@ -1,5 +1,5 @@
1
1
  module Guard
2
2
  module JekyllVersion
3
- VERSION = '1.2.0'
3
+ VERSION = '1.3.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: guard-jekyll
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-05-05 00:00:00.000000000 Z
12
+ date: 2013-05-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: guard