Skip to content
Snippets Groups Projects
Commit 06060dd2 authored by Hendrik Borras's avatar Hendrik Borras
Browse files

Merge remote-tracking branch 'origin/feature/upsampling' into feature/upsampling 

# Conflicts:
#	src/finn/custom_op/fpgadataflow/upsampler.py
#	src/finn/transformation/fpgadataflow/convert_to_hls_layers.py
parents cb6389d4 95f7834f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment