Update gendoc.py

gnocchixyz · Aug 20, 2024 · 193b44a · 193b44a
1 parent 3360378
commit 193b44a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/gnocchi/gendoc.py b/gnocchi/gendoc.py
@@ -13,11 +13,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-<<<<<<< HEAD
-from __future__ import absolute_import
-=======
 
->>>>>>> fa7d13d4 (Remove the use of the future module)
 import io
 import json
 import os