Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04da20e authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

calendar fix

parent a691e209
Loading
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -19,18 +19,6 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
<<<<<<< HEAD
@import 'app-navigation';
@import 'app-sidebar';
@import 'app-settings';
@import 'app-modal';
@import 'freebusy';
@import 'fullcalendar';
@import 'global';
@import 'import';
@import 'print';
@import 'public';
=======
@import 'app-navigation.scss';
@import 'app-sidebar.scss';
@import 'app-settings.scss';
@@ -42,4 +30,3 @@
@import 'print.scss';
@import 'public.scss';
@import 'props-linkify-links.scss';
>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4