resolved conflicts
This commit is contained in:
Senad Uka
8
.idea/rijeci.iml
generated
8
.idea/rijeci.iml
generated
@@ -167,7 +167,7 @@
|
||||
<orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="execjs (v2.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="hike (v1.2.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.9, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="jbuilder (v1.5.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.0.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
@@ -175,17 +175,15 @@
|
||||
<orderEntry type="library" scope="PROVIDED" name="mime-types (v1.25.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="minitest (v4.7.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="oj (v2.4.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rack-cors (v0.2.9, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rails (v4.0.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="railties (v4.0.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="ridc (v0.0.7, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="sass (v3.2.12, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="sass (v3.2.13, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v4.0.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="sdoc (v0.3.20, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="sprockets (v2.10.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
|
||||
|
||||
49
.idea/workspace.xml
generated
49
.idea/workspace.xml
generated
@@ -63,6 +63,15 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/Gemfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="38" column="37" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.0" vertical-offset="175" max-vertical-offset="825">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="guesses_controller.rb" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/controllers/guesses_controller.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
@@ -75,7 +84,7 @@
|
||||
<file leaf-file-name="application.html.erb" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="28" column="0" selection-start="962" selection-end="962" vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="510">
|
||||
<state line="27" column="0" selection-start="740" selection-end="740" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="495">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -99,15 +108,6 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="rails_intelligence.rb" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/config/initializers/rails_intelligence.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="7" column="0" selection-start="229" selection-end="229" vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="195">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FindManager">
|
||||
@@ -141,8 +141,8 @@
|
||||
<option value="$USER_HOME$/.rvm/gems/ruby-1.9.3-p194/gems/ridc-0.0.7/lib/sender.rb" />
|
||||
<option value="$USER_HOME$/.rvm/gems/ruby-1.9.3-p194/gems/ridc-0.0.7/lib/ridc.rb" />
|
||||
<option value="$PROJECT_DIR$/config/initializers/rails_intelligence.rb" />
|
||||
<option value="$PROJECT_DIR$/Gemfile" />
|
||||
<option value="$PROJECT_DIR$/app/controllers/guesses_controller.rb" />
|
||||
<option value="$PROJECT_DIR$/Gemfile" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -571,14 +571,14 @@
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="22" width="1920" height="1054" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<editor active="false" />
|
||||
<layout>
|
||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19895834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19895834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||
@@ -612,13 +612,6 @@
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/app/views/guesses/index.html.erb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="9" column="0" selection-start="261" selection-end="261" vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="225">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/initializers/rails_intelligence.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="7" column="0" selection-start="229" selection-end="229" vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="195">
|
||||
@@ -855,16 +848,9 @@
|
||||
<state line="136" column="0" selection-start="3509" selection-end="3509" vertical-scroll-proportion="0.3323077" vertical-offset="1824" max-vertical-offset="2475" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Gemfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="32" column="3" selection-start="919" selection-end="919" vertical-scroll-proportion="0.46923077" vertical-offset="175" max-vertical-offset="825">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="28" column="0" selection-start="962" selection-end="962" vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="510">
|
||||
<state line="27" column="0" selection-start="740" selection-end="740" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="495">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -918,6 +904,13 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Gemfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="38" column="37" selection-start="1024" selection-end="1024" vertical-scroll-proportion="0.0" vertical-offset="175" max-vertical-offset="825">
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state line="20" column="0" selection-start="678" selection-end="678" vertical-scroll-proportion="0.46153846" vertical-offset="0" max-vertical-offset="650">
|
||||
|
||||
Reference in New Issue
Block a user