Re: default_css.css conflicts

 
From: "Dada Mail" <dada@PROTECTED>
In-Reply-To: Re: any and all CSS bugs, suggestions and snippets welcomed
Date: July 25th 2005

OK, as per my last message to the list, there were some conflicts in
the files I basically followed the directions at:

 http://cvsbook
red-bean
com/cvsbook
html#Detecting%20And%

20Resolving%20Conflicts

The "conflict markers" didn't really give me anything sensical, but
Shane told me that he changed the entire file, so that was expected
My difference was very incredibly small, so it wasn't an issue to
just use the latest revision that he created as a start and then
apply my changes to that I then committed a new revision up into CVS

A nice little lesson learned :)

Justin Simoni

rss/atom
‹ Re: any and all CSS bugs, suggestions and snippets welcomed
Index
RE: any and all CSS bugs, suggestions and snippets welcomed ›
  • This mailing list is a public mailing list - anyone may join or leave, at any time.
  • This mailing list is a group discussion list (unmoderated)

  • Start a new thread, email: dadadev@dadamailproject.com

This is the developer discussion mailing list for Dada Mail.

If you are just looking for support Dada Mail, consult the message boards at:

https://forum.dadamailproject.com

Documentation for Dada Mail:

https://dadamailproject.com/d

Specifically, see the Error FAQ:

https://dadamailproject.com/d/FAQ-errors.pod.html

To post to this list, send a message to:

mailto:dadadev@dadamailproject.com

All subscribers of this list may post to the list itself.

Topics that are welcome:

  • Constructive critiques on the program (I like, "x", but, "y" needs some work - here's an idea on how to make this better...)
  • Bug/Error reports
  • Bug fixes
  • Request For Comments on any changes to the program
  • Help customizing Dada Mail for your own needs
  • Patches
  • Language Translations
  • Support Documentation/Doc editing, FAQ's, etc.
  • Discussion of any changes that you would like to be committed to the next version of Dada Mail -

Dada Mail is on Github:

https://github.com/justingit/dada-mail/

If you would like to fork, branch, send over PRs, open up issues, etc.

Privacy Policy:

This Privacy Policy is for this mailing list, and this mailing list only.

Email addresses collection through this mailing list are used explicitly to work within this email discussion list.

We only collect email addresses through our Closed-Loop Opt-In system.

We don't use your email address for any other purpose.

We won't be sharing your email address with any other entity.

Unsubscription can be done at any time. Please contact us at: justin@dadamailproject.com for any help regarding your subscription, including removal from the mailing list.

All mailing list messages sent from us will include a subscription removal link, which will allow you to remove yourself from this mailing list automatically, and permanently.

All consent to use your email address for any other purpose stated at the time of the mailing list subscription will also be revoked upon mailing list removal.