[Fix] Update gan's init

3 years ago · b12bc7bb34
parent 33b5f0fd3e
commit b12bc7bb34
1 changed files with 0 additions and 3 deletions
--- a/paddlers/custom_models/gan/init.py
+++ b/paddlers/custom_models/gan/init.py
@ -11,8 +11,5 @@
 # WITHOUT 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 .rcan_model import RCANModel
-=======
->>>>>>> 343f646f7dabf2ff08d80fab4ac5a37511260bd2