haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean git conflict markers

This commit is contained in:
Seth Hillbrand 2024-06-20 09:25:04 -07:00
parent a8871fdda4
commit 02f8260e18
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eeschema/tools/ee_selection_tool.cpp
View File

@ -1035,12 +1035,7 @@ OPT_TOOL_EVENT EE_SELECTION_TOOL::autostartEvent( TOOL_EVENT* aEvent, EE_GRID_HE
wxCHECK( pin, OPT_TOOL_EVENT() ); wxCHECK( pin, OPT_TOOL_EVENT() );
if( !pin->IsVisible() if( !pin->IsVisible()
<<<<<<< HEAD
&& !( m_frame->eeconfig()->m_Appearance.show_hidden_pins
|| m_frame->GetRenderSettings()->m_ShowHiddenLibPins ) )
=======
&& !( m_frame->eeconfig()->m_Appearance.show_hidden_pins ) ) && !( m_frame->eeconfig()->m_Appearance.show_hidden_pins ) )
>>>>>>> 763cabad43 (Fix cherry-pick for v8)
{ {
return OPT_TOOL_EVENT(); return OPT_TOOL_EVENT();
} }