qhandout 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/VERSION +1 -1
  2. data/lib/qhandout.rb +1 -5
  3. metadata +2 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.0
1
+ 0.3.1
@@ -111,11 +111,7 @@ class Handout
111
111
  end
112
112
 
113
113
  def create_frontpage
114
- <<<<<<< HEAD
115
- footer = "(c) 2005-2013 QWAN -Quality Without a Name\nwww.qwan.eu -- news@qwan.eu"
116
- =======
117
- footer = "(c) 2005-2012 QWAN -Quality Without a Name\nwww.qwan.eu"
118
- >>>>>>> 2037e25d102d949f525b7841cc9fad62cfac3f2a
114
+ footer = "(c) 2005-2013 QWAN -Quality Without a Name\nwww.qwan.eu"
119
115
 
120
116
  new_page("frontpage.pdf", footer) do | pdf |
121
117
  pdf.image "#{File.dirname(__FILE__)}/qwan_logo_small.png", :position => :center
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: qhandout
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
121
121
  version: '0'
122
122
  segments:
123
123
  - 0
124
- hash: 110342257
124
+ hash: 472274319
125
125
  required_rubygems_version: !ruby/object:Gem::Requirement
126
126
  none: false
127
127
  requirements: