Merging "Allow multiple include"

pboling · Jul 12, 2012 · 58722a0 · 58722a0
1 parent 00bf266
commit 58722a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ Gemfile.lock
 gemfiles/*.lock
 pkg/*
 rdoc/*
+/.rvmrc
diff --git a/lib/flag_shih_tzu.rb b/lib/flag_shih_tzu.rb
@@ -10,8 +10,8 @@ module FlagShihTzu
 
   def self.included(base)
     base.extend(ClassMethods)
-    base.class_attribute :flag_options
+    base.class_attribute :flag_options unless defined?(base.flag_options)
-    base.class_attribute :flag_mapping
+    base.class_attribute :flag_mapping unless defined?(base.flag_mapping)
   end
 
   class IncorrectFlagColumnException < Exception; end