dev_bert
zhangjinli 2 years ago
parent 64bec6a3d7
commit fadb2d78c0

@ -10,10 +10,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="fixed img_scale;comment delete"> <list default="true" id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="fixed img_scale;comment delete">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

Loading…
Cancel
Save