lib/startback/web/auto_caching.rb in startback-0.4.1 vs lib/startback/web/auto_caching.rb in startback-0.4.2

@@ -52,10 +52,10 @@
       end
 
     protected
 
       def patch_response_headers(hs)
-        hs.merge(development? ? @cache_headers[:development] : @cache_headers[:production])
+        (development? ? @cache_headers[:development] : @cache_headers[:production]).merge(hs)
       end
 
       def development?
         !!@development
       end