[Conflict resolution.
prb@mult.ifario.us**20080616203228] hunk ./src/Blog/Constants.hs 93
-flickr_api_key = "233b3c334c93b6f999f9b4b810f9d603"
+flickr_api_key = "" -- fill yours in