gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2025-12-12 15:49:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Michael Hunhoff
2020-09-09 12:45:35 -06:00
parent 793c9a276b
commit 697ec9736e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
capa/ida/plugin/proxy.py
View File

@@ -6,10 +6,6 @@
# is distributed on an "AS IS" BASIS, 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.
import six
<<<<<<< HEAD
=======
>>>>>>> master
from PyQt5 import QtCore
from PyQt5.QtCore import Qt