Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #3489 #3787

Closed
wants to merge 8 commits into from
Closed

Fix for #3489 #3787

wants to merge 8 commits into from

Conversation

abhishekgupta5
Copy link
Contributor

No description provided.

@@ -117,4 +117,7 @@ org.freedesktop.UDisks2.h
/po/po.*.js
/po/po.*.js.gz
/pkg/storaged/index.min.html.gz
/.gitignore.swp
/cockpit-wip.tar.gz
/srpm-build.Wt9BcW/
Copy link
Member

Choose a reason for hiding this comment

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

All this looks unrelated. But yes, our .gitignore is not in a good shape...

Copy link
Member

Choose a reason for hiding this comment

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

srpm-build.Wt9BcW/ looks like a random name. We should use a pattern.

@mvollmer
Copy link
Member

I would leave the .gitignore cleanup out of this.

@abhishekgupta5
Copy link
Contributor Author

@andreasn Ya, I was confused between 36 or 35. Will correct it

@abhishekgupta5
Copy link
Contributor Author

Why did this test failed ?

@stefwalter
Copy link
Contributor

Why did this test failed ?

Because this is included in the pull request:

 +<<<<<<< HEAD
           <textarea id="authorized-keys-text" placeholder="Paste the contents of your public SSH key file here" class="form-control" style="resize:none;margin-bottom:10px"></textarea>
+=======
+          <textarea id="authorized-keys-text" placeholder="Paste the contents of your public ssh key file here" class="form-control" style="resize:none;margin-bottom:10px"></textarea>
+>>>>>>> c0d5e2bda6c3538a62d5bf9d5ea67b8195e2a1d1 

@stefwalter
Copy link
Contributor

Solved in #3870

@stefwalter stefwalter closed this Mar 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants