Skip to content
Permalink
Browse files
Fixed merge issue in file
  • Loading branch information
labriola committed Jun 26, 2012
1 parent 63a89a9 commit e0a9b9bedeb261321aa24697ed6154e9aa0fc506
Showing 1 changed file with 0 additions and 4 deletions.
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<<<<<<< HEAD
<actionScriptProperties analytics="false" mainApplicationPath="UIRunner.mxml" projectUUID="c0791c78-cb1b-4837-9e08-e5a4373e5714" version="6">
=======
<actionScriptProperties analytics="false" mainApplicationPath="UIRunner.mxml" projectUUID="c0791c78-cb1b-4837-9e08-e5a4373e5714" version="7">
>>>>>>> 176f2432292cb449acd4d71c51e40eb77d757fff
<compiler additionalCompilerArguments="-locale en_US -define=CONFIG::useFlexClasses,true" autoRSLOrdering="false" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="1">

0 comments on commit e0a9b9b

Please sign in to comment.