Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/ahmetuysal/LogDos into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
ahmetuysal committed Jan 25, 2020
2 parents 0ad81b7 + 8dad110 commit cf8de69
Show file tree
Hide file tree
Showing 22 changed files with 25,206 additions and 105 deletions.
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

4 changes: 2 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions LogDos.iml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@
</src_description>
</component>
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/../bin" />
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<content url="file://$MODULE_DIR$/..">
<sourceFolder url="file://$MODULE_DIR$/../src" isTestSource="false" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library" exported="">
<orderEntry type="module-library">
<library name="org.eclipse.jdt.annotation_2.2.300.v20190328-1431.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/org.eclipse.jdt.annotation_2.2.300.v20190328-1431.jar!/" />
<root url="jar://$MODULE_DIR$/lib/org.eclipse.jdt.annotation_2.2.300.v20190328-1431.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<orderEntry type="module-library">
<library name="guava-28.1-jre.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/guava-28.1-jre.jar!/" />
<root url="jar://$MODULE_DIR$/lib/guava-28.1-jre.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Expand Down
Loading

0 comments on commit cf8de69

Please sign in to comment.