~wxr/HdlToLc.git

			@@ -1,5 +1,10 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<<<<<<< HEAD
			<module version="4">
			=======
			<module external.linked.project.id=":third-zxing" external.linked.project.path="$MODULE_DIR$/../../../third-zxing" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="LCAndroidSDKDemo" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
			<component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="LCAndroidSDKDemo" externalSystemModuleVersion="unspecified" linkedProjectId=":third-zxing" linkedProjectPath="$MODULE_DIR$/../../../third-zxing" rootProjectPath="$MODULE_DIR$/../../.." />
			>>>>>>> dev
			<component name="FacetManager">
			<facet type="android-gradle" name="Android-Gradle">
			<configuration>
			@@ -26,6 +31,8 @@
			</configuration>
			</facet>
			</component>
			<<<<<<< HEAD
			=======
			<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
			<output url="file://$MODULE_DIR$/../../../third-zxing/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
			<output-test url="file://$MODULE_DIR$/../../../third-zxing/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
			@@ -88,4 +95,5 @@
			<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
			<orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
			</component>
			>>>>>>> dev
			</module>