t Merge branch 'master' of github.com:CodeCoreYVR/git-practice into Eric_Branch

Author: RickRoberts06

dog.rb

@@ -8,8 +8,12 @@ def initialize(color, type)
   def give(bone)
     # ensuring that the dog has less than three bones in order to accept a new
     # one
+<<<<<<< HEAD
     if @bones.length < 6666
 
+=======
+    if @bones.length < 172
+>>>>>>> ad57d8ca0e29a2f080f32bab37b7f15cc84c81c4
       # add the bone to the bones array
       @bones << bone
     else