From ceb4e0e369cf1f16889e735616bdc101c00f099b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 3 Jun 2014 22:40:26 +0200
Subject: [PATCH] fixed previous merge

---
 src/Symfony/Component/HttpFoundation/HeaderBag.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
index 4cae5058ec..354980d154 100644
--- a/src/Symfony/Component/HttpFoundation/HeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -247,8 +247,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
      *
      * @param string $key   The Cache-Control directive name
      * @param mixed  $value The Cache-Control directive value
-     *
-     * @api
      */
     public function addCacheControlDirective($key, $value = true)
     {
@@ -263,8 +261,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
      * @param string $key The Cache-Control directive
      *
      * @return bool true if the directive exists, false otherwise
-     *
-     * @api
      */
     public function hasCacheControlDirective($key)
     {
@@ -277,8 +273,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
      * @param string $key The directive name
      *
      * @return mixed|null The directive value if defined, null otherwise
-     *
-     * @api
      */
     public function getCacheControlDirective($key)
     {
@@ -289,8 +283,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
      * Removes a Cache-Control directive.
      *
      * @param string $key The Cache-Control directive
-     *
-     * @api
      */
     public function removeCacheControlDirective($key)
     {