Skip to content

Conversation

@vijitis
Copy link

@vijitis vijitis commented Apr 6, 2017

No description provided.

Copy link
Owner

@n0nzy n0nzy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @vijitis . I've reviewed your changes...everything looks great, but there is one minor issue, because you're using Windows.

Kindly add the following line below to your .gitignore file located in the project's root directory.
/.idea/gradle.xml

Your /.idea/gradle.xml file contains Windows specific info which will always clash whenever I try to merge your code in the future.

Do this on your local computer, commit changes, push to your repo and re-send a pull request to me.

<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @vijitis

Please add the following line to your .gitignore file.

  • /.idea/gradle.xml

After you have done this, send me another pull request.

Copy link
Author

@vijitis vijitis Apr 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the file. Its set up as you have stated. Do I need to make any other changes?? The file dats is mentioned below:

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've added that line to your .gitignore file?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was already there!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants