Skip to content

Commit

Permalink
fix merge conflict resolution error
Browse files Browse the repository at this point in the history
  • Loading branch information
Titus-von-Koeller committed Jan 29, 2024
1 parent eade779 commit a6325fa
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bitsandbytes/autograd/_functions.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from dataclasses import dataclass
from functools import reduce # Required in Python 3
import operator
from typing import Optional, Tuple
import warnings
from dataclasses import dataclass
from functools import reduce # Required in Python 3
from typing import Tuple, Optional, Callable
from warnings import warn

import torch
Expand Down

0 comments on commit a6325fa

Please sign in to comment.