Permalink
Browse files

Merging "Allow multiple include"

  • Loading branch information...
1 parent 00bf266 commit 58722a073e8ccd99ac3abec1352281dae073ab40 @cinconnu cinconnu committed Jul 12, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 lib/flag_shih_tzu.rb
View
@@ -9,3 +9,4 @@ Gemfile.lock
gemfiles/*.lock
pkg/*
rdoc/*
+/.rvmrc
View
@@ -10,8 +10,8 @@ module FlagShihTzu
def self.included(base)
base.extend(ClassMethods)
- base.class_attribute :flag_options
- base.class_attribute :flag_mapping
+ base.class_attribute :flag_options unless defined?(base.flag_options)
+ base.class_attribute :flag_mapping unless defined?(base.flag_mapping)
end
class IncorrectFlagColumnException < Exception; end

0 comments on commit 58722a0

Please sign in to comment.