| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196 |
- <?xml version="1.0" encoding="UTF-8"?>
- <project version="4">
- <component name="ChangeListManager">
- <list default="true" id="a1659534-018e-4427-a691-d840db4a80bb" name="Default" comment="">
- <<<<<<< HEAD
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_h2database_h2_1_4_196.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_0_RELEASE.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/passProj.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_postgresql_postgresql_42_2_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_hateoas_2_0_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_hal_browser_3_0_5_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/javaee.jar" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/passionProject.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Account.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Enemy.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/GamePlay.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/HumanPlayer.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Player.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/static/style.css" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/users/index.html" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/users/new.html" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/users/show.html" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/test/java/Questions.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/MainMenuController.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/MainMenu.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/static/style.css" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/users/index.html" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/users/new.html" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/users/show.html" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/test-classes/Questions.class" beforeDir="false" />
- =======
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/Login.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/MysteryQuestions.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswersRepository.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_14_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_postgresql_postgresql_42_2_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_rest_2_0_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_hateoas_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_3_0_5_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_hal_browser_3_0_5_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_webmvc_3_0_5_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_24_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/passionProject.iml" beforeDir="false" afterPath="$PROJECT_DIR$/passionProject.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/MainMenuController.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/MainMenu.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" beforeDir="false" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </list>
- <ignored path="$PROJECT_DIR$/target/" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="TRACKING_ENABLED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <<<<<<< HEAD
- <component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="true" />
- <option name="GROUP_DATA_SOURCES" value="true" />
- <option name="GROUP_SCHEMA" value="true" />
- <option name="GROUP_CONTENTS" value="false" />
- <option name="SORT_POSITIONED" value="false" />
- <option name="SHOW_EMPTY_GROUPS" value="false" />
- <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
- <option name="HIDDEN_KINDS">
- <set />
- </option>
- <expand />
- <select />
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- =======
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="EasyQuestions.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="13" column="41" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#672#673#0" expanded="true" />
- <element signature="e#701#702#0" expanded="true" />
- <element signature="e#738#739#0" expanded="true" />
- <element signature="e#774#775#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EasyQuestionAnswers.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- </file>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor />
- <second_editor />
- </state>
- </provider>
- </entry>
- </file>
- <<<<<<< HEAD
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
- =======
- <file leaf-file-name="EasyRepository.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="11" selection-start-line="11" selection-end-line="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file leaf-file-name="HardRepository.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </state>
- </provider>
- </entry>
- </file>
- <<<<<<< HEAD
- <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file leaf-file-name="GameEngine.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
- =======
- <file leaf-file-name="EasyQuestionsController.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EasyQuestionAnswersController.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="243">
- <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <<<<<<< HEAD
- =======
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="Interface" />
- <option value="Class" />
- </list>
- </option>
- </component>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <<<<<<< HEAD
- <option value="$PROJECT_DIR$/pom.xml" />
- =======
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/Login.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryQuestions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/HardRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/MysteryQuestions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/AnswerRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/Answer.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/AnswerController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyAnswer.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyAnswerController.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswers.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswersRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java" />
- <option value="$PROJECT_DIR$/pom.xml" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java" />
- <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </list>
- </option>
- </component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsGulpfileManager">
- <detection-done>true</detection-done>
- <sorting>DEFINITION_ORDER</sorting>
- </component>
- <component name="MavenImportPreferences">
- <option name="importingSettings">
- <MavenImportingSettings>
- <option name="importAutomatically" value="true" />
- </MavenImportingSettings>
- </option>
- </component>
- <component name="NodePackageJsonFileManager">
- <packageJsonPaths />
- </component>
- <<<<<<< HEAD
- <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
- <option name="x" value="436" />
- <option name="y" value="23" />
- <option name="width" value="844" />
- <option name="height" value="722" />
- =======
- <component name="ProjectFrameBounds" extendedState="1">
- <option name="y" value="23" />
- <option name="width" value="1280" />
- <option name="height" value="730" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
- <component name="ProjectView">
- <navigator proportions="" version="1">
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <<<<<<< HEAD
- =======
- <pane id="Scope" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <pane id="ProjectPane">
- <subPane>
- <expand>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="passionproject" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <<<<<<< HEAD
- =======
- <item name="controller" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <item name="model" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="repositories" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- </path>
- <<<<<<< HEAD
- =======
- <path>
- <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
- <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="test" type="462c0819:PsiDirectoryNode" />
- </path>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </expand>
- <select />
- </subPane>
- </pane>
- <<<<<<< HEAD
- <pane id="PackagesPane" />
- <pane id="AndroidView" />
- <pane id="Scope" />
- =======
- <pane id="AndroidView" />
- <pane id="PackagesPane" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="RequestMappingsPanelOrder0" value="0" />
- <property name="RequestMappingsPanelOrder1" value="1" />
- <<<<<<< HEAD
- <property name="RequestMappingsPanelWidth0" value="75" />
- <property name="RequestMappingsPanelWidth1" value="75" />
- =======
- <property name="RequestMappingsPanelOrder2" value="2" />
- <property name="RequestMappingsPanelWidth0" value="75" />
- <property name="RequestMappingsPanelWidth1" value="75" />
- <property name="RequestMappingsPanelWidth2" value="75" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="node.js.path.for.package.eslint" value="project" />
- <property name="node.js.path.for.package.standard" value="project" />
- <property name="node.js.selected.package.eslint" value="/usr/local/lib/node_modules/eslint" />
- <property name="node.js.selected.package.standard" value="" />
- <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
- <property name="nodejs_npm_path_reset_for_default_project" value="true" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="project.structure.proportion" value="0.0" />
- <property name="project.structure.side.proportion" value="0.0" />
- <property name="settings.editor.selected.configurable" value="terminal" />
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager" selected="Spring Boot.GameEngine (1)">
- <configuration default="true" type="Application" factoryName="Application">
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <patterns />
- </configuration>
- <<<<<<< HEAD
- <configuration name="GameEngine (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
- <module name="passProj" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="passionproject.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <option name="SPRING_BOOT_MAIN_CLASS" value="passionproject.GameEngine" />
- </configuration>
- =======
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <configuration name="GameEngine" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
- <module name="passionProject" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="passionproject.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <option name="SPRING_BOOT_MAIN_CLASS" value="passionproject.GameEngine" />
- </configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG">
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <properties />
- <listeners />
- </configuration>
- <<<<<<< HEAD
- <list>
- <item itemvalue="Spring Boot.GameEngine" />
- <item itemvalue="Spring Boot.GameEngine (1)" />
- </list>
- <recent_temporary>
- <list>
- <item itemvalue="Spring Boot.GameEngine (1)" />
- =======
- <recent_temporary>
- <list>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <item itemvalue="Spring Boot.GameEngine" />
- </list>
- </recent_temporary>
- </component>
- <component name="SvnConfiguration">
- <configuration>$USER_HOME$/.subversion</configuration>
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="a1659534-018e-4427-a691-d840db4a80bb" name="Default" comment="" />
- <created>1531487848837</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1531487848837</updated>
- <workItem from="1531487851169" duration="335000" />
- <<<<<<< HEAD
- <workItem from="1531488336520" duration="3134000" />
- <workItem from="1531754362604" duration="257000" />
- =======
- <workItem from="1531918988277" duration="12317000" />
- <workItem from="1531942331738" duration="11707000" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </task>
- <servers />
- </component>
- <component name="TimeTrackingManager">
- <<<<<<< HEAD
- <option name="totallyTimeSpent" value="3726000" />
- </component>
- <component name="ToolWindowManager">
- <frame x="508" y="0" width="772" height="800" extended-state="6" />
- <editor active="true" />
- =======
- <option name="totallyTimeSpent" value="24359000" />
- </component>
- <component name="ToolWindowManager">
- <frame x="0" y="0" width="772" height="800" extended-state="6" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <layout>
- <window_info anchor="right" id="Palette" order="3" />
- <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
- <window_info anchor="right" id="Maven Projects" order="3" />
- <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
- <window_info id="Capture Tool" order="2" />
- <window_info id="Designer" order="2" />
- <<<<<<< HEAD
- <window_info anchor="right" id="Database" order="3" weight="0.32956383" />
- =======
- <window_info anchor="right" id="Database" order="3" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
- <window_info id="UI Designer" order="2" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
- <window_info anchor="bottom" id="TODO" order="6" />
- <<<<<<< HEAD
- <window_info anchor="bottom" id="Messages" order="8" />
- =======
- <window_info anchor="bottom" id="Messages" order="8" weight="0.32965517" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <window_info anchor="right" id="Palette	" order="3" />
- <window_info id="Image Layers" order="2" />
- <window_info anchor="bottom" id="Java Enterprise" order="7" weight="0.3296" />
- <window_info anchor="right" id="Capture Analysis" order="3" />
- <<<<<<< HEAD
- <window_info anchor="bottom" id="Run" order="2" weight="0.56" />
- <window_info anchor="bottom" id="Version Control" order="7" />
- <window_info anchor="bottom" id="Spring" order="7" />
- <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.41379312" />
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16027397" />
- =======
- <window_info anchor="bottom" id="Run" order="2" weight="0.3627586" />
- <window_info anchor="bottom" id="Version Control" order="7" />
- <window_info anchor="bottom" id="Spring" order="7" weight="0.32965517" />
- <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.38482758" />
- <window_info id="Persistence" side_tool="true" />
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2041096" />
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <window_info anchor="right" id="Bean Validation" order="3" />
- <window_info id="Web" order="2" side_tool="true" />
- <window_info anchor="right" id="Theme Preview" order="3" />
- <window_info id="Favorites" order="2" side_tool="true" />
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
- <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
- <window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
- <window_info anchor="bottom" id="Find" order="1" />
- </layout>
- <<<<<<< HEAD
- =======
- <layout-to-restore>
- <window_info id="Designer" order="2" />
- <window_info anchor="right" id="Palette" order="3" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.3627586" />
- <window_info anchor="bottom" id="Spring" order="7" weight="0.32965517" />
- <window_info id="Image Layers" order="3" />
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
- <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
- <window_info id="UI Designer" order="4" />
- <window_info id="Favorites" order="5" side_tool="true" />
- <window_info anchor="bottom" id="Terminal" order="8" weight="0.24965517" />
- <window_info id="Capture Tool" order="6" />
- <window_info anchor="right" id="Capture Analysis" order="4" />
- <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
- <window_info anchor="bottom" id="Messages" order="13" weight="0.32965517" />
- <window_info anchor="bottom" id="TODO" order="6" />
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
- <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3296" />
- <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
- <window_info anchor="bottom" id="Version Control" order="12" />
- <window_info anchor="right" id="Maven Projects" order="5" />
- <window_info anchor="bottom" id="Find" order="1" />
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2819063" />
- <window_info anchor="right" id="Database" order="6" />
- <window_info anchor="bottom" id="Message" order="0" />
- <window_info id="Web" order="7" side_tool="true" />
- <window_info anchor="right" id="Palette	" order="7" />
- <window_info anchor="right" id="Theme Preview" order="8" />
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
- <window_info anchor="right" id="Bean Validation" order="9" />
- </layout-to-restore>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="1" />
- </component>
- <component name="VcsContentAnnotationSettings">
- <option name="myLimit" value="2678400000" />
- </component>
- <component name="editorHistoryManager">
- <<<<<<< HEAD
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor />
- <second_editor />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/style.css">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
- =======
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" selection-start-line="10" selection-end-line="10" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#672#673#0" expanded="true" />
- <element signature="e#701#702#0" expanded="true" />
- <element signature="e#738#739#0" expanded="true" />
- <element signature="e#774#775#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="555">
- <caret line="37" column="34" selection-start-line="37" selection-start-column="34" selection-end-line="37" selection-end-column="34" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="420">
- <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="480">
- <caret line="32" column="73" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="495">
- <caret line="33" column="62" lean-forward="true" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" selection-start-line="10" selection-end-line="10" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/passionProject.iml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/HumanPlayer.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/GamePlay.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/MysteryQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="229">
- <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="495">
- <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="420">
- <caret line="28" selection-start-line="28" selection-end-line="28" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="10" selection-start-line="10" selection-end-line="10" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="480">
- <caret line="32" column="73" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswerRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="1" lean-forward="true" selection-end-line="6" selection-end-column="1" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/Account.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="19" column="23" lean-forward="true" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/Enemy.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/Login.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="8" column="11" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswersRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="11" selection-start-line="11" selection-end-line="11" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
- <state split_layout="SPLIT">
- <first_editor />
- <second_editor />
- </state>
- </provider>
- </entry>
- <<<<<<< HEAD
- <entry file="file://$USER_HOME$/Labs/passProj/src/main/java/passionproject/GameEngine.java" />
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/style.css">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$USER_HOME$/Labs/passProj/src/main/resources/application.properties" />
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- =======
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="13" column="41" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#672#673#0" expanded="true" />
- <element signature="e#701#702#0" expanded="true" />
- <element signature="e#738#739#0" expanded="true" />
- <element signature="e#774#775#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <<<<<<< HEAD
- =======
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="243">
- <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- >>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
- </component>
- <component name="masterDetails">
- <states>
- <state key="ArquillianSettingsConfigurable.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ArtifactsStructureConfigurable.UI">
- <settings>
- <artifact-editor />
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="FacetStructureConfigurable.UI">
- <settings>
- <last-edited>Spring</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="GlobalLibrariesConfigurable.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="JdkListConfigurable.UI">
- <settings>
- <last-edited>1.8</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ModuleStructureConfigurable.UI">
- <settings>
- <last-edited>passionProject</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- <option value="0.6" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectJDKs.UI">
- <settings>
- <last-edited>1.8</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectLibrariesConfigurable.UI">
- <settings>
- <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- </states>
- </component>
- </project>
|