Created
July 27, 2011 08:36
-
-
Save rgarner/1108931 to your computer and use it in GitHub Desktop.
Rubymine .iml conflict-causing behaviour
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <orderEntry type="inheritedJdk" /> | |
| <orderEntry type="sourceFolder" forTests="false" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="rack (v1.2.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="riddle (v1.2.2, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="rack (v1.2.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.1, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="activesupport (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.2, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| @@ -137,15 +137,15 @@ | |
| <orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="activemodel (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="haml (v3.0.25, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="net-scp (v1.0.4, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="thor (v0.14.6, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="net-scp (v1.0.4, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="arel (v2.0.7, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="fastercsv (v1.5.4, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rdfa (v0.0.8, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="net-ssh (v2.1.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rgarner-csv-mapper (v0.7.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="net-ssh-gateway (v1.0.1, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rails (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="net-ssh-gateway (v1.0.1, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="railties (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rspec (v2.5.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.5.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| @@ -155,35 +155,35 @@ | |
| <orderEntry type="library" scope="PROVIDED" name="webrat (v0.7.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="mocha (v0.9.10, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.16, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="erubis (v2.6.6, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="activeresource (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="erubis (v2.6.6, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="capistrano (v2.5.19, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="semantically-taggable (v0.4.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="thinking-sphinx (v2.0.2, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="builder (v2.1.2, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="bundler (v1.0.15, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="factory_girl (v1.3.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="rabl (v0.2.8, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="log4r (v1.1.9, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="mail (v2.2.15, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="rabl (v0.2.8, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rack-test (v0.5.7, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="mail (v2.2.15, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v1.0.1, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="fast_xs (v0.8.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="activerecord (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="fast_xs (v0.8.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="net-sftp (v2.0.5, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rack-mount (v0.6.14, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="actionpack (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v2.5.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="actionpack (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rdiscount (v1.6.8, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="actionmailer (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.5.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="actionmailer (v3.0.3, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="abstract (v1.0.0, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="tzinfo (v0.3.28, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.2.6, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.4.4, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="capistrano-ext (v1.2.1, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| - <orderEntry type="library" scope="PROVIDED" name="rake (v0.8.7, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| <orderEntry type="library" scope="PROVIDED" name="will_paginate (v653f34, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| + <orderEntry type="library" scope="PROVIDED" name="rake (v0.8.7, Ruby SDK 1.9.2) [gem]" level="application" /> | |
| </component> | |
| </module> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment